[RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs

netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs
@ 2008-06-22 22:20 Jeff Kirsher
  2008-06-22 22:21 ` [RESEND PATCH 2/3] e1000: remove PCI Express device IDs Jeff Kirsher
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Jeff Kirsher @ 2008-06-22 22:20 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel, davem

From: Auke Kok <auke-jan.h.kok@intel.com>

This adds to the already default CONFIG_E1000=y in these files.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

 arch/x86/configs/i386_defconfig   |    1 +
 arch/x86/configs/x86_64_defconfig |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index ad7ddaa..b738c78 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -814,6 +814,7 @@ CONFIG_NETDEV_1000=y
 CONFIG_E1000=y
 # CONFIG_E1000_NAPI is not set
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000E=y
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 2d6f5b2..0fb202e 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -740,6 +740,7 @@ CONFIG_NETDEV_1000=y
 CONFIG_E1000=y
 # CONFIG_E1000_NAPI is not set
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000E=y
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [RESEND PATCH 2/3] e1000: remove PCI Express device IDs
  2008-06-22 22:20 [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Jeff Kirsher
@ 2008-06-22 22:21 ` Jeff Kirsher
  2008-06-27  6:08   ` Jeff Garzik
  2008-06-22 22:22 ` [RESEND PATCH 3/3] e1000: enable NAPI by default in defconfig Jeff Kirsher
  2008-06-23 11:26 ` [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Ingo Molnar
  2 siblings, 1 reply; 8+ messages in thread
From: Jeff Kirsher @ 2008-06-22 22:21 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel, davem

From: Auke Kok <auke-jan.h.kok@intel.com>

We do not want to prolong the situation much longer that e1000
and e1000e support these devices at the same time. As a result,
take out the bandage that was added for the interim period
and remove all the PCI Express device IDs from e1000.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
---

 drivers/net/Kconfig            |    3 ---
 drivers/net/e1000/e1000_main.c |   33 ---------------------------------
 2 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f4182cf..9135b21 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2014,9 +2014,6 @@ config E1000E
 	  To compile this driver as a module, choose M here. The module
 	  will be called e1000e.
 
-config E1000E_ENABLED
-	def_bool E1000E != n
-
 config IP1000
 	tristate "IP1000 Gigabit Ethernet support"
 	depends on PCI && EXPERIMENTAL
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 59579b1..b0e2493 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -47,12 +47,6 @@ static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation
  * Macro expands to...
  *   {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
  */
-#ifdef CONFIG_E1000E_ENABLED
-  #define PCIE(x) 
-#else
-  #define PCIE(x) x,
-#endif
-
 static struct pci_device_id e1000_pci_tbl[] = {
 	INTEL_E1000_ETHERNET_DEVICE(0x1000),
 	INTEL_E1000_ETHERNET_DEVICE(0x1001),
@@ -79,14 +73,6 @@ static struct pci_device_id e1000_pci_tbl[] = {
 	INTEL_E1000_ETHERNET_DEVICE(0x1026),
 	INTEL_E1000_ETHERNET_DEVICE(0x1027),
 	INTEL_E1000_ETHERNET_DEVICE(0x1028),
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x1049))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x104A))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x104B))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x104C))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x104D))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x105E))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x105F))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x1060))
 	INTEL_E1000_ETHERNET_DEVICE(0x1075),
 	INTEL_E1000_ETHERNET_DEVICE(0x1076),
 	INTEL_E1000_ETHERNET_DEVICE(0x1077),
@@ -95,28 +81,9 @@ PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x1060))
 	INTEL_E1000_ETHERNET_DEVICE(0x107A),
 	INTEL_E1000_ETHERNET_DEVICE(0x107B),
 	INTEL_E1000_ETHERNET_DEVICE(0x107C),
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x107D))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x107E))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x107F))
 	INTEL_E1000_ETHERNET_DEVICE(0x108A),
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x108B))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x108C))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x1096))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x1098))
 	INTEL_E1000_ETHERNET_DEVICE(0x1099),
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x109A))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10A4))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10A5))
 	INTEL_E1000_ETHERNET_DEVICE(0x10B5),
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10B9))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10BA))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10BB))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10BC))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10C4))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10C5))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10D5))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10D9))
-PCIE(	INTEL_E1000_ETHERNET_DEVICE(0x10DA))
 	/* required last entry */
 	{0,}
 };


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [RESEND PATCH 2/3] e1000: remove PCI Express device IDs
  2008-06-22 22:21 ` [RESEND PATCH 2/3] e1000: remove PCI Express device IDs Jeff Kirsher
@ 2008-06-27  6:08   ` Jeff Garzik
  0 siblings, 0 replies; 8+ messages in thread
From: Jeff Garzik @ 2008-06-27  6:08 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: netdev, linux-kernel, davem, Ingo Molnar, Thomas Gleixner,
	Andrew Morton

Jeff Kirsher wrote:
> From: Auke Kok <auke-jan.h.kok@intel.com>
> 
> We do not want to prolong the situation much longer that e1000
> and e1000e support these devices at the same time. As a result,
> take out the bandage that was added for the interim period
> and remove all the PCI Express device IDs from e1000.
> 
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: Jeff Garzik <jeff@garzik.org>
> ---
> 
>  drivers/net/Kconfig            |    3 ---
>  drivers/net/e1000/e1000_main.c |   33 ---------------------------------
>  2 files changed, 0 insertions(+), 36 deletions(-)

applied to #upstream-next (queued for 2.6.27)

BIG FLASHING WARNING NOTE to x86 maintainers and others:

Make sure your defconfig changes are in place for this change.



^ permalink raw reply	[flat|nested] 8+ messages in thread

* [RESEND PATCH 3/3] e1000: enable NAPI by default in defconfig
  2008-06-22 22:20 [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Jeff Kirsher
  2008-06-22 22:21 ` [RESEND PATCH 2/3] e1000: remove PCI Express device IDs Jeff Kirsher
@ 2008-06-22 22:22 ` Jeff Kirsher
  2008-06-23 11:26 ` [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Ingo Molnar
  2 siblings, 0 replies; 8+ messages in thread
From: Jeff Kirsher @ 2008-06-22 22:22 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel, davem

From: Auke Kok <auke-jan.h.kok@intel.com>

It's preferred to run with NAPI enabled, even for e1000. e1000e
runs at all times in NAPI mode so this setting is not used.

In the future we'll make e1000 NAPI-only.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

 arch/ia64/configs/generic_defconfig             |    2 +-
 arch/ia64/configs/gensparse_defconfig           |    2 +-
 arch/ia64/configs/tiger_defconfig               |    2 +-
 arch/ia64/configs/zx1_defconfig                 |    2 +-
 arch/mips/configs/mtx1_defconfig                |    2 +-
 arch/parisc/configs/c3000_defconfig             |    2 +-
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig |    2 +-
 arch/powerpc/configs/g5_defconfig               |    2 +-
 arch/powerpc/configs/iseries_defconfig          |    2 +-
 arch/powerpc/configs/maple_defconfig            |    2 +-
 arch/powerpc/configs/ppc64_defconfig            |    2 +-
 arch/powerpc/configs/prpmc2800_defconfig        |    2 +-
 arch/powerpc/configs/pseries_defconfig          |    2 +-
 arch/ppc/configs/bamboo_defconfig               |    2 +-
 arch/ppc/configs/katana_defconfig               |    2 +-
 arch/sh/configs/r7780mp_defconfig               |    2 +-
 arch/x86/configs/i386_defconfig                 |    2 +-
 arch/x86/configs/x86_64_defconfig               |    2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig
index 0210545..b1694e2 100644
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@ -592,7 +592,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig
index e86fbd3..dc46ad6 100644
--- a/arch/ia64/configs/gensparse_defconfig
+++ b/arch/ia64/configs/gensparse_defconfig
@@ -594,7 +594,7 @@ CONFIG_E100=m
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 797acf9..780fb99 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -574,7 +574,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 0a06b13..4122b76 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -634,7 +634,7 @@ CONFIG_E100=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig
index fa3aa39..46c6773 100644
--- a/arch/mips/configs/mtx1_defconfig
+++ b/arch/mips/configs/mtx1_defconfig
@@ -1297,7 +1297,7 @@ CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig
index c6def3c..c89d490 100644
--- a/arch/parisc/configs/c3000_defconfig
+++ b/arch/parisc/configs/c3000_defconfig
@@ -552,7 +552,7 @@ CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_NS83820 is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index de95d32..f73664c 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -520,7 +520,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_E1000E_ENABLED is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 0ccc6e4..cc9fe7d 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -740,7 +740,7 @@ CONFIG_ACENIC=y
 CONFIG_ACENIC_OMIT_TIGON_I=y
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_E1000E_ENABLED is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 63f0bdb..87ce879 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -662,7 +662,7 @@ CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_E1000E_ENABLED is not set
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 7a166a3..1006be8 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -607,7 +607,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_NS83820 is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index ce250bc..072e903 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -949,7 +949,7 @@ CONFIG_ACENIC=y
 CONFIG_ACENIC_OMIT_TIGON_I=y
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_E1000E_ENABLED is not set
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index c6b8357..fdde9e4 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_defconfig
@@ -741,7 +741,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_E1000E_ENABLED is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index adaa05f..04f8c4e 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -767,7 +767,7 @@ CONFIG_ACENIC=y
 CONFIG_ACENIC_OMIT_TIGON_I=y
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_E1000E_ENABLED is not set
diff --git a/arch/ppc/configs/bamboo_defconfig b/arch/ppc/configs/bamboo_defconfig
index 41fd393..cb4998e 100644
--- a/arch/ppc/configs/bamboo_defconfig
+++ b/arch/ppc/configs/bamboo_defconfig
@@ -498,7 +498,7 @@ CONFIG_NATSEMI=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
diff --git a/arch/ppc/configs/katana_defconfig b/arch/ppc/configs/katana_defconfig
index 7311fe6..b5329ac 100644
--- a/arch/ppc/configs/katana_defconfig
+++ b/arch/ppc/configs/katana_defconfig
@@ -487,7 +487,7 @@ CONFIG_E100=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index 1a07261..c65ece0 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_defconfig
@@ -622,7 +622,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_E1000E is not set
 # CONFIG_E1000E_ENABLED is not set
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index b738c78..e3f3349 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -812,7 +812,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000E=y
 # CONFIG_NS83820 is not set
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 0fb202e..f23a68c 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -738,7 +738,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000E=y
 # CONFIG_NS83820 is not set


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs
  2008-06-22 22:20 [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Jeff Kirsher
  2008-06-22 22:21 ` [RESEND PATCH 2/3] e1000: remove PCI Express device IDs Jeff Kirsher
  2008-06-22 22:22 ` [RESEND PATCH 3/3] e1000: enable NAPI by default in defconfig Jeff Kirsher
@ 2008-06-23 11:26 ` Ingo Molnar
  2008-06-23 23:14   ` Jeff Kirsher
  2008-06-23 23:20   ` Jeff Garzik
  2 siblings, 2 replies; 8+ messages in thread
From: Ingo Molnar @ 2008-06-23 11:26 UTC (permalink / raw)
  To: Jeff Kirsher; +Cc: jeff, netdev, linux-kernel, davem


* Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:

> From: Auke Kok <auke-jan.h.kok@intel.com>
> 
> This adds to the already default CONFIG_E1000=y in these files.
> 
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
> 
>  arch/x86/configs/i386_defconfig   |    1 +
>  arch/x86/configs/x86_64_defconfig |    1 +

that is not an e1000 patch but an arch/x86 defconfig patch. NAK on this 
route of patch propagation.

	Ingo

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs
  2008-06-23 11:26 ` [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Ingo Molnar
@ 2008-06-23 23:14   ` Jeff Kirsher
  2008-06-23 23:20   ` Jeff Garzik
  1 sibling, 0 replies; 8+ messages in thread
From: Jeff Kirsher @ 2008-06-23 23:14 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: jeff, netdev, linux-kernel, davem

On Mon, Jun 23, 2008 at 4:26 AM, Ingo Molnar <mingo@elte.hu> wrote:
>
> * Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
>
>> From: Auke Kok <auke-jan.h.kok@intel.com>
>>
>> This adds to the already default CONFIG_E1000=y in these files.
>>
>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> ---
>>
>>  arch/x86/configs/i386_defconfig   |    1 +
>>  arch/x86/configs/x86_64_defconfig |    1 +
>
> that is not an e1000 patch but an arch/x86 defconfig patch. NAK on this
> route of patch propagation.
>

So you are fine with the patch contents, just not the title/subject
line.  So if the subject line was:

[RESEND PATCH 1/3] x86 defconfig: set CONFIG_E1000E=y in x86 defconfigs

Would that have been alright?

-- 
Cheers,
Jeff

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs
  2008-06-23 11:26 ` [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Ingo Molnar
  2008-06-23 23:14   ` Jeff Kirsher
@ 2008-06-23 23:20   ` Jeff Garzik
  2008-06-26 12:39     ` Ingo Molnar
  1 sibling, 1 reply; 8+ messages in thread
From: Jeff Garzik @ 2008-06-23 23:20 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: Jeff Kirsher, netdev, linux-kernel, davem

Ingo Molnar wrote:
> * Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
> 
>> From: Auke Kok <auke-jan.h.kok@intel.com>
>>
>> This adds to the already default CONFIG_E1000=y in these files.
>>
>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> ---
>>
>>  arch/x86/configs/i386_defconfig   |    1 +
>>  arch/x86/configs/x86_64_defconfig |    1 +
> 
> that is not an e1000 patch but an arch/x86 defconfig patch. NAK on this 
> route of patch propagation.

But it's dependent on an e1000 patch.  Maybe we could follow the lead of 
ppc and other arch maintainers, and work together?

Typically if there are arch dependencies and little drivers/net changes, 
I'll ACK the drivers/net change and then let it go through the arch tree.

In this case, there is far more drivers/net code, so it would make the 
most sense to work with you to change the defconfigs to your liking, and 
then merge them via netdev when the other E1000 changes go in.

	Jeff

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs
  2008-06-23 23:20   ` Jeff Garzik
@ 2008-06-26 12:39     ` Ingo Molnar
  0 siblings, 0 replies; 8+ messages in thread
From: Ingo Molnar @ 2008-06-26 12:39 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: Jeff Kirsher, netdev, linux-kernel, davem


* Jeff Garzik <jeff@garzik.org> wrote:

> Ingo Molnar wrote:
>> * Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
>>
>>> From: Auke Kok <auke-jan.h.kok@intel.com>
>>>
>>> This adds to the already default CONFIG_E1000=y in these files.
>>>
>>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
>>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>> ---
>>>
>>>  arch/x86/configs/i386_defconfig   |    1 +
>>>  arch/x86/configs/x86_64_defconfig |    1 +
>>
>> that is not an e1000 patch but an arch/x86 defconfig patch. NAK on this 
>> route of patch propagation.
>
> But it's dependent on an e1000 patch.  Maybe we could follow the lead 
> of ppc and other arch maintainers, and work together?
>
> Typically if there are arch dependencies and little drivers/net 
> changes, I'll ACK the drivers/net change and then let it go through 
> the arch tree.
>
> In this case, there is far more drivers/net code, so it would make the 
> most sense to work with you to change the defconfigs to your liking, 
> and then merge them via netdev when the other E1000 changes go in.

the normal flow for defconfig changes is to first do the driver changes, 
then later on propagate anything that is needed into the defconfig, once 
the driver change is upstream.

for example we've already got this queued up in tip/x86:

| commit b5d958ea66ac11b1190c24f042f517adf9229a98
| Author: Auke Kok <auke-jan.h.kok@intel.com>
| Date:   Wed Apr 9 13:17:39 2008 -0700
|
|    e1000e: set CONFIG_E1000E=y in x86 defconfigs
|
|    This adds to the already default CONFIG_E1000=y in these files.

and there's a fair number of other changes as well to the defconfigs for 
v2.6.27 which might collide. So it would be nice to keep it separate 
please.

	Ingo

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2008-06-27  6:08 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-22 22:20 [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Jeff Kirsher
2008-06-22 22:21 ` [RESEND PATCH 2/3] e1000: remove PCI Express device IDs Jeff Kirsher
2008-06-27  6:08   ` Jeff Garzik
2008-06-22 22:22 ` [RESEND PATCH 3/3] e1000: enable NAPI by default in defconfig Jeff Kirsher
2008-06-23 11:26 ` [RESEND PATCH 1/3] e1000e: set CONFIG_E1000E=y in x86 defconfigs Ingo Molnar
2008-06-23 23:14   ` Jeff Kirsher
2008-06-23 23:20   ` Jeff Garzik
2008-06-26 12:39     ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).