From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618Ab0G2BTO (ORCPT ); Wed, 28 Jul 2010 21:19:14 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:38760 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751178Ab0G2BTI (ORCPT ); Wed, 28 Jul 2010 21:19:08 -0400 Date: Thu, 29 Jul 2010 11:19:04 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bruce Allan , Jeff Kirsher Subject: linux-next: manual merge of the net tree with the net-current tree Message-Id: <20100729111904.90b148a6.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/e1000e/hw.h between commit ff847ac2d3e90edd94674c28bade25ae1e6a2e49 ("") from the net-current tree and commit d3738bb8203acf8552c3ec8b3447133fc0938ddd ("e1000e: initial support for 82579 LOMs") from the net tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/net/e1000e/hw.h index 664ed58,0cd569a..0000000 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h @@@ -308,8 -312,8 +312,8 @@@ enum e1e_registers #define E1000_KMRNCTRLSTA_INBAND_PARAM 0x9 /* Kumeran InBand Parameters */ #define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000 /* Nearend Loopback mode */ #define E1000_KMRNCTRLSTA_K1_CONFIG 0x7 -#define E1000_KMRNCTRLSTA_K1_ENABLE 0x140E +#define E1000_KMRNCTRLSTA_K1_ENABLE 0x0002 - #define E1000_KMRNCTRLSTA_K1_DISABLE 0x1400 + #define E1000_KMRNCTRLSTA_HD_CTRL 0x0002 #define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10 #define IFE_PHY_SPECIAL_CONTROL 0x11 /* 100BaseTx PHY Special Control */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the net tree with the net-current tree Date: Thu, 29 Jul 2010 11:19:04 +1000 Message-ID: <20100729111904.90b148a6.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:38760 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751178Ab0G2BTI (ORCPT ); Wed, 28 Jul 2010 21:19:08 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bruce Allan , Jeff Kirsher Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/e1000e/hw.h between commit ff847ac2d3e90edd94674c28bade25ae1e6a2e49 ("") from the net-current tree and commit d3738bb8203acf8552c3ec8b3447133fc0938ddd ("e1000e: initial support for 82579 LOMs") from the net tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/net/e1000e/hw.h index 664ed58,0cd569a..0000000 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h @@@ -308,8 -312,8 +312,8 @@@ enum e1e_registers #define E1000_KMRNCTRLSTA_INBAND_PARAM 0x9 /* Kumeran InBand Parameters */ #define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000 /* Nearend Loopback mode */ #define E1000_KMRNCTRLSTA_K1_CONFIG 0x7 -#define E1000_KMRNCTRLSTA_K1_ENABLE 0x140E +#define E1000_KMRNCTRLSTA_K1_ENABLE 0x0002 - #define E1000_KMRNCTRLSTA_K1_DISABLE 0x1400 + #define E1000_KMRNCTRLSTA_HD_CTRL 0x0002 #define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10 #define IFE_PHY_SPECIAL_CONTROL 0x11 /* 100BaseTx PHY Special Control */