The patch titled e1000e: make E1000E default to the same kconfig setting as E1000 has been added to the -mm tree. Its filename is e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: e1000e: make E1000E default to the same kconfig setting as E1000 From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Make E1000E default to the same kconfig setting as E1000. So people's machiens don't stop working when they use oldconfig. Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Cc: Auke Kok <auke-jan.h.kok@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/Kconfig | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/net/Kconfig~e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000 drivers/net/Kconfig --- a/drivers/net/Kconfig~e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000 +++ a/drivers/net/Kconfig @@ -1986,6 +1986,7 @@ config E1000_DISABLE_PACKET_SPLIT config E1000E tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" depends on PCI + default E1000 ---help--- This driver supports the PCI-Express Intel(R) PRO/1000 gigabit ethernet family of adapters. For PCI or PCI-X e1000 adapters, _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are git-dvb.patch git-kbuild.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch pcmcia-include-bad-cis-filename-in-error-message.patch git-scsi-misc.patch advansys-fix-section-mismatch-warning.patch aic94-fix-section-mismatches.patch sym2-fix-section-mismatch-warning.patch git-unionfs.patch git-ipwireless_cs.patch git-x86.patch register_cpu-__devinit-or-__cpuinit.patch cciss-use-upper_32_bits-macro-to-eliminate-warnings.patch dio-fix-kernel-doc-notation.patch move-kprobes-examples-to-samples-resend.patch move-kprobes-examples-to-samples-resend-checkpatch-fixes.patch move-kprobes-examples-to-samples-resend-vs-git-x86.patch fs-menu-small-reorg.patch profile-likely-unlikely-macros.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html