The patch titled e1000: Disable aggressive clocking on esb2 with SERDES port has been added to the -mm tree. Its filename is e1000-disable-aggressive-clocking-on-esb2-with-serdes-port.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: e1000: Disable aggressive clocking on esb2 with SERDES port From: "Kok, Auke" <auke-jan.h.kok@xxxxxxxxx> Disable aggressive clocking on esb2 with SERDES port as it causes hardware problems. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx> Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/net/e1000/e1000_main.c | 2 -- 1 files changed, 2 deletions(-) diff -puN drivers/net/e1000/e1000_main.c~e1000-disable-aggressive-clocking-on-esb2-with-serdes-port drivers/net/e1000/e1000_main.c --- a/drivers/net/e1000/e1000_main.c~e1000-disable-aggressive-clocking-on-esb2-with-serdes-port +++ a/drivers/net/e1000/e1000_main.c @@ -1498,8 +1498,6 @@ e1000_configure_tx(struct e1000_adapter } else if (hw->mac_type == e1000_80003es2lan) { tarc = E1000_READ_REG(hw, TARC0); tarc |= 1; - if (hw->media_type == e1000_media_type_internal_serdes) - tarc |= (1 << 20); E1000_WRITE_REG(hw, TARC0, tarc); tarc = E1000_READ_REG(hw, TARC1); tarc |= 1; _ 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