headers
Kyle McMartin | 3 Jul 2007 22:15
Favicon

[ubuntu-gutsy-lum] Allow e1000-ich9 and e1000 to coexist

Might be nice to let both coexist... Otherwise a nasty kobject warning
and a BUG_ON backtrace are in your future, as two drivers try to
register the same name.

Signed-off-by: Kyle McMartin <kyle <at> ubuntu.com>

diff --git a/ubuntu/net/e1000-ich9/e1000_main.c b/ubuntu/net/e1000-ich9/e1000_main.c
index 60b16bc..5fcd429 100644
--- a/ubuntu/net/e1000-ich9/e1000_main.c
+++ b/ubuntu/net/e1000-ich9/e1000_main.c
 <at>  <at>  -56,7 +56,7  <at>  <at> 

 #include "e1000.h"

-char e1000_driver_name[] = "e1000";
+char e1000_driver_name[] = "e1000-ich9";
 static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";

 #ifdef CONFIG_E1000_NAPI
Permalink | Reply | 1 comment |
headers
Amit Kucheria | 3 Jul 2007 23:11
Favicon

Re: [ubuntu-gutsy-lum] Allow e1000-ich9 and e1000 to coexist

On 7/3/07, Kyle McMartin <kyle <at> ubuntu.com> wrote:
> Might be nice to let both coexist... Otherwise a nasty kobject warning
> and a BUG_ON backtrace are in your future, as two drivers try to
> register the same name.
>
> Signed-off-by: Kyle McMartin <kyle <at> ubuntu.com>
>
> diff --git a/ubuntu/net/e1000-ich9/e1000_main.c b/ubuntu/net/e1000-ich9/e1000_main.c
> index 60b16bc..5fcd429 100644
> --- a/ubuntu/net/e1000-ich9/e1000_main.c
> +++ b/ubuntu/net/e1000-ich9/e1000_main.c
>  <at>  <at>  -56,7 +56,7  <at>  <at> 
>
>  #include "e1000.h"
>
> -char e1000_driver_name[] = "e1000";
> +char e1000_driver_name[] = "e1000-ich9";
>  static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
>
>  #ifdef CONFIG_E1000_NAPI
>
> --

Looks sane. Applied to LUM. Thanks.
Permalink | Reply | 0 comments |
headers
Ben Collins | 4 Jul 2007 03:26
Favicon

Re: [ubuntu-gutsy-lum] Allow e1000-ich9 and e1000 to coexist

On Tue, 2007-07-03 at 16:15 -0400, Kyle McMartin wrote:
> Might be nice to let both coexist... Otherwise a nasty kobject warning
> and a BUG_ON backtrace are in your future, as two drivers try to
> register the same name.
> 
> Signed-off-by: Kyle McMartin <kyle <at> ubuntu.com>
> 
> diff --git a/ubuntu/net/e1000-ich9/e1000_main.c b/ubuntu/net/e1000-ich9/e1000_main.c
> index 60b16bc..5fcd429 100644
> --- a/ubuntu/net/e1000-ich9/e1000_main.c
> +++ b/ubuntu/net/e1000-ich9/e1000_main.c
>  <at>  <at>  -56,7 +56,7  <at>  <at> 
>  
>  #include "e1000.h"
>  
> -char e1000_driver_name[] = "e1000";
> +char e1000_driver_name[] = "e1000-ich9";
>  static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
>  
>  #ifdef CONFIG_E1000_NAPI

Thanks. Applied to lbm-2.6.20 as well.

--

-- 
Ubuntu   : http://www.ubuntu.com/
Linux1394: http://wiki.linux1394.org/
Permalink | Reply | 0 comments |
headers
Kyle McMartin | 4 Jul 2007 19:24
Favicon

Fwd: e1000: backport ich9 support from 7.5.5 ?

Probably a much better idea than using e1000-ich9 for feisty/gutsy...

--Kyle

----- Forwarded message from Mark McLoughlin <markmc <at> redhat.com> -----

Sender: netdev-owner <at> vger.kernel.org
From: Mark McLoughlin <markmc <at> redhat.com>
Subject: e1000: backport ich9 support from 7.5.5 ?
Message-Id: <1183138159.17243.16.camel <at> blaa>
To: Auke Kok <auke-jan.h.kok <at> intel.com>
Cc: netdev <at> vger.kernel.org, e1000-devel <at> lists.sourceforge.net
Date:	Fri, 29 Jun 2007 18:29:18 +0100
Organization: Red Hat Ltd. Registered Address: Red Hat Ltd, Brian O'
	Donnell and Partners, 62 Merrion Square, Dublin 2, Ireland. Registered in
	the Companies Registration Office, Parnell House, 14 Parnell Square, Dublin
	1, Ireland, at No. 304873 Directors: Charlie Peters (USA), Michael
	Cunningham (USA), Matt Parson (USA), Brendan Lane
X-Mailer: Evolution 2.10.2 (2.10.2-2.fc7) 

Hi Auke,
	I understand there is some delay in getting e1000-7.5.5 into the
upstream kernel given the major re-working of the chipset specific
parts.

	I wonder would it be feasible in the meantime to backport the ich9
support and push it upstream?

	A first-cut at the backport is attached. Note, this patch applies
against latest netdev-2.6-git, but I haven't actually tested this
(Continue reading)

Permalink | Reply | 1 comment |
headers
Ben Collins | 4 Jul 2007 19:50
Favicon

Re: Fwd: e1000: backport ich9 support from 7.5.5 ?

On Wed, 2007-07-04 at 13:24 -0400, Kyle McMartin wrote:
> Probably a much better idea than using e1000-ich9 for feisty/gutsy...

It's still a very extensive patch, so I wouldn't even want it in the
main kernel tree, which means it would be pretty much the same route,
lum/lbm, and not much gain.

I also don't like that it claims this patch against netdev-2.6 isn't
even tested other then compilation, and the 2.6.18 backport was only
lightly tested.

I feel more comfortable with the e1000-ich9 approach. Fewer potential
problems.

> --Kyle
> 
> ----- Forwarded message from Mark McLoughlin <markmc <at> redhat.com> -----
> 
> Sender: netdev-owner <at> vger.kernel.org
> From: Mark McLoughlin <markmc <at> redhat.com>
> Subject: e1000: backport ich9 support from 7.5.5 ?
> Message-Id: <1183138159.17243.16.camel <at> blaa>
> To: Auke Kok <auke-jan.h.kok <at> intel.com>
> Cc: netdev <at> vger.kernel.org, e1000-devel <at> lists.sourceforge.net
> Date:	Fri, 29 Jun 2007 18:29:18 +0100
> Organization: Red Hat Ltd. Registered Address: Red Hat Ltd, Brian O'
> 	Donnell and Partners, 62 Merrion Square, Dublin 2, Ireland. Registered in
> 	the Companies Registration Office, Parnell House, 14 Parnell Square, Dublin
> 	1, Ireland, at No. 304873 Directors: Charlie Peters (USA), Michael
> 	Cunningham (USA), Matt Parson (USA), Brendan Lane
(Continue reading)

Permalink | Reply | 0 comments |
headers
Fabio Massimo Di Nitto | 5 Jul 2007 12:15
Favicon

[GUTSY] pull + patches


Hi guys,

for whoever is going to upload gutsy next:

please pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/ldom-2.6.git

update the sparc configs to match:

CONFIG_SUN_LDOMS=y
CONFIG_SUNVDC=m
CONFIG_SUNVNET=m

both for up and smp kernel.

update the d-i module lists:

diff --git a/debian/d-i/modules/block-modules b/debian/d-i/modules/block-modules
index ca833ee..b593b84 100644
--- a/debian/d-i/modules/block-modules
+++ b/debian/d-i/modules/block-modules
 <at>  <at>  -27,6 +27,7  <at>  <at>  pg ?
 pt ?
 pktcdvd ?
 ps3_storage ?
+sunvdc ?
 sx8 ?
 umem ?
 xd ?
diff --git a/debian/d-i/modules/nic-modules b/debian/d-i/modules/nic-modules
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stefan Skotte | 10 Jul 2007 11:44
Picon

PMP support for 2.6.22


Hi there,

Please consider the following patches for proper SATA and port
multiplier support.

Description of patch from
http://home-tj.org/wiki/index.php/Libata-tj-stable:

==========================================================================
20070702: libata-tj-2.6.22-rc6-20070702 is available, at last. AHCI PMP
support is now available and the overall PMP support is much more
polished. It now should have that 'just works' feeling. If you
experience any problem, please report. There still are some remaining
issues. Please read the included README. This version is submitted for
upstream inclusion, again, at last. It will probably end up in 2.6.23.
Also, I'll prepare another patchset on top of 2.6.22 when it's released.
Thanks for your patience.  :-P
==========================================================================

Patch against rc6 of 2.6.22:

http://home-tj.org/files/libata-tj-stable/libata-tj-2.6.22-rc6-20070702.tar.bz2

It works great, and have had no problems running the past 8 days on my
production server with SOHOTANK-ST6600 (5 disk eSATA array).

Hope you will include it.

Kind regards,
(Continue reading)

Permalink | Reply | 501 comments |
headers
Ben Collins | 10 Jul 2007 17:52
Favicon

Re: PMP support for 2.6.22

On Tue, 2007-07-10 at 11:44 +0200, Stefan Skotte wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi there,
> 
> Please consider the following patches for proper SATA and port
> multiplier support.

Wow

 70 files changed, 4758 insertions(+), 2165 deletions(-)

So, yeah, there's no way we're going to include the patch. Hopefully
this gets into 2.6.23 or 2.6.24 so we can have it for gutsy+1.

--

-- 
Ubuntu   : http://www.ubuntu.com/
Linux1394: http://wiki.linux1394.org/
Permalink | Reply | 501 comments |
headers
Mario Limonciello | 11 Jul 2007 10:11
Favicon

Revisit adding lirc modules to kernel tree

Hi Guys,

I was looking to revisit a bug that was opened up shortly before
Feisty's release
(https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.20/+bug/69534).
 I had wanted to add the misc lirc  modules to the Ubuntu build tree so
that users didn't have to use module assistant to rebuild after every
kernel update.

Shortly after the last kernel freeze, Arnaud and the UMC team left this
note on the bug report:

> This bug will be addressed upstream by a sub project of the Ubuntu Media Center Team.
> 
> https://wiki.ubuntu.com/RemoteControls
> 
> I have already started to discuss with Christoph Bartelmus (LIRC project leader) and Jon Smirl, who has
started some work.
> Kernel hackers needed. If you're interested in, contact me back.

When I read this, I thought it would be great since it would alleviate
the need for my patch from previous.  Now as we near alpha 3, its
appearing as though this won't be happening for Gutsy.  The Wiki page
above describes that 'drivers recompilation' is "Under Investigation"
and "not started (0 %)".   I attempted to contact Arnaud a few days ago,
but have not received a response with an update.

These modules not making it into some form of the kernel tree is going
to turn into a blocker for Mythbuntu's release unless we regularly check
gutsy-changes for new kernel releases and regularly rebuild modules to
(Continue reading)

Permalink | Reply | 668 comments |
headers
Ben Collins | 11 Jul 2007 15:17
Favicon

Re: Revisit adding lirc modules to kernel tree


On Wed, 2007-07-11 at 03:11 -0500, Mario Limonciello wrote:
> Hi Guys,
> 
> I was looking to revisit a bug that was opened up shortly before
> Feisty's release
> (https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.20/+bug/69534).
>  I had wanted to add the misc lirc  modules to the Ubuntu build tree so
> that users didn't have to use module assistant to rebuild after every
> kernel update.

How we would prefer you do this is to:

- Obtain the linux-ubuntu-modules tree for gutsy via
http://kernel.ubuntu.com/git

- Integrate the modules into this build under ubuntu/misc/

- Request us to integrate your changes into our tree:

  a) Make your git tree available so we can pull from it, or...
  b) Produce patches from your git-tree that we can apply onto ours

- In either case, send this request to kernel-team <at> lists.ubuntu.com

Thanks

--

-- 
Ubuntu   : http://www.ubuntu.com/
Linux1394: http://wiki.linux1394.org/
(Continue reading)

Permalink | Reply | 1 comment |

Gmane