The patch titled e100: increment version to 3.5.10-k4 has been added to the -mm tree. Its filename is e100-increment-version-to-3510-k4.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: e100: increment version to 3.5.10-k4 From: "Kok, Auke" <auke-jan.h.kok@xxxxxxxxx> Increment the version of e100 to 3.5.10-k4, increment dates. Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/net/e100.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/net/e100.c~e100-increment-version-to-3510-k4 drivers/net/e100.c --- a/drivers/net/e100.c~e100-increment-version-to-3510-k4 +++ a/drivers/net/e100.c @@ -1,7 +1,7 @@ /******************************************************************************* - Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. + Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -158,10 +158,10 @@ #define DRV_NAME "e100" -#define DRV_EXT "-NAPI" -#define DRV_VERSION "3.5.10-k2"DRV_EXT +#define DRV_EXT "-NAPI" +#define DRV_VERSION "3.5.10-k4"DRV_EXT #define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver" -#define DRV_COPYRIGHT "Copyright(c) 1999-2005 Intel Corporation" +#define DRV_COPYRIGHT "Copyright(c) 1999-2006 Intel Corporation" #define PFX DRV_NAME ": " #define E100_WATCHDOG_PERIOD (2 * HZ) _ Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are e100-fix-mdio-mdio-x.patch e100-increment-version-to-3510-k4.patch e1000-same-cosmetic-fix-as-earlier-sent-out-for-ipv4.patch e1000-remove-0x1000-as-supported-device.patch e1000-explicitly-power-up-the-phy-during-loopback-testing.patch e1000-explicit-locking-for-two-ethtool-path-functions.patch e1000-allow-nvm-to-setup-lplu-for-igp2-and-igp3.patch e1000-force-full-dma-clocking-for-10-100-speed.patch e1000-disable-aggressive-clocking-on-esb2-with-serdes-port.patch e1000-increment-driver-version-to-719-k6.patch ixgb-add-cx4-phy-type-detection-and-subdevice-id.patch ixgb-fix-cache-miss-due-to-miscalculation.patch ixgb-increment-version-to-10109-k4.patch ixgb-add-pci-error-recovery-callbacks.patch e100-disable-device-on-pci-error.patch e1000-disable-device-on-pci-error.patch e1000_7033_dump_ring.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