From: Adrian Bunk <bunk@stusta•de>
To: Andrew Morton <akpm@linux-foundation•org>,
Auke Kok <auke-jan.h.kok@intel•com>,
jgarzik@pobox•com
Cc: linux-kernel@vger•kernel.org, e1000-devel@lists•sourceforge.net,
netdev@vger•kernel.org
Subject: [-mm patch] one e1000 driver should be enough for everyone
Date: Wed, 25 Jul 2007 15:36:50 +0200 [thread overview]
Message-ID: <20070725133650.GB3572@stusta.de> (raw)
In-Reply-To: <20070725040304.111550f4.akpm@linux-foundation.org>
On Wed, Jul 25, 2007 at 04:03:04AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.22-rc6-mm1:
>...
> git-e1000new.patch
>...
> git trees
>...
Both e1000 drivers compiled into the kernel resulted in the following
compile error:
<-- snip -->
...
LD drivers/net/built-in.o
drivers/net/e1000/built-in.o: In function `e1000_read_mac_addr':
(.text+0xb9f2): multiple definition of `e1000_read_mac_addr'
drivers/net/e1000new/built-in.o:(.text+0x821a): first defined here
drivers/net/e1000/built-in.o: In function `e1000_phy_setup_autoneg':
(.text+0x8799): multiple definition of `e1000_phy_setup_autoneg'
drivers/net/e1000new/built-in.o:(.text+0xa9bd): first defined here
...
make[3]: *** [drivers/net/built-in.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@stusta•de>
---
BTW:
Unless I'm misunderstanding anything, the new driver should support a
superset of what the old driver supported.
Therefore, it would be good if the final merge into Linus' tree will
do an
rm -r drivers/net/e1000
mv drivers/net/e1000new drivers/net/e1000
--- linux-2.6.23-rc1-mm1/drivers/net/Kconfig.old 2007-07-25 15:06:13.000000000 +0200
+++ linux-2.6.23-rc1-mm1/drivers/net/Kconfig 2007-07-25 15:09:59.000000000 +0200
@@ -2036,7 +2036,7 @@
config E1000
tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
- depends on PCI
+ depends on PCI && E1000NEW=n
---help---
This driver supports Intel(R) PRO/1000 gigabit ethernet family of
adapters. For more information on how to identify your adapter, go
next parent reply other threads:[~2007-07-25 13:37 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070725040304.111550f4.akpm@linux-foundation.org>
2007-07-25 13:36 ` Adrian Bunk [this message]
2007-07-25 13:48 ` [-mm patch] one e1000 driver should be enough for everyone Jeff Garzik
2007-07-25 14:46 ` Adrian Bunk
2007-07-25 15:05 ` Jeff Garzik
2007-07-25 15:21 ` Kok, Auke
2007-07-25 15:23 ` Jeff Garzik
2007-07-25 20:50 ` Andrew Morton
2007-07-25 18:15 ` 2.6.23-rc1-mm1: net/ipv4/fib_trie.c compile error Adrian Bunk
2007-07-26 8:46 ` [RFT] fib_trie: cleanup Stephen Hemminger
2007-07-26 8:49 ` David Miller
2007-07-26 10:32 ` Robert Olsson
2007-07-26 9:04 ` Andrew Morton
2007-07-26 9:15 ` Stephen Hemminger
2007-07-26 10:49 ` [RFC] fib_trie: whitespace cleanup Stephen Hemminger
2007-07-26 15:44 ` Paul E. McKenney
2007-07-27 4:56 ` Andrew Morton
2007-07-30 17:07 ` Paul E. McKenney
2007-07-26 10:43 ` [RFT] fib_trie: macro cleanup Stephen Hemminger
2007-07-26 10:54 ` Andrew Morton
2007-07-28 15:44 ` NETPOLL=y , NETDEVICES=n compile error ( Re: 2.6.23-rc1-mm1 ) Gabriel C
2007-07-28 17:26 ` Andrew Morton
2007-07-28 18:42 ` Gabriel C
2007-07-31 8:32 ` Jarek Poplawski
2007-07-31 10:14 ` Gabriel C
2007-07-31 11:44 ` Jason Wessel
2007-07-31 12:47 ` Jarek Poplawski
2007-07-31 12:17 ` Jarek Poplawski
2007-07-31 15:05 ` Gabriel C
2007-08-01 9:59 ` Jarek Poplawski
2007-08-02 2:02 ` Matt Mackall
2007-08-02 9:00 ` Jarek Poplawski
2007-08-02 15:59 ` Matt Mackall
2007-08-03 7:30 ` Jarek Poplawski
2007-08-02 9:36 ` Sam Ravnborg
2007-08-02 10:32 ` Satyam Sharma
2007-08-02 11:40 ` Satyam Sharma
2007-08-02 11:40 ` Jarek Poplawski
2007-08-02 11:56 ` Satyam Sharma
2007-08-02 12:52 ` Jarek Poplawski
2007-08-06 11:51 ` [PATCH] docs: note about select in kconfig-language.txt Jarek Poplawski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070725133650.GB3572@stusta.de \
--to=bunk@stusta$(echo .)de \
--cc=akpm@linux-foundation$(echo .)org \
--cc=auke-jan.h.kok@intel$(echo .)com \
--cc=e1000-devel@lists$(echo .)sourceforge.net \
--cc=jgarzik@pobox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox