Re: linux-next: manual merge of the net tree with the net-current tree

[Jeff Kirsher]

On Wed, Jul 28, 2010 at 18:19, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxxxxx
>
> 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 */
> --

yes, that is fine and expected.  When Dave sync's up is net-next-2.6
tree with net-2.6 tree, this issue will be fixed up.

-- 
Cheers,
Jeff
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/