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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <AANLkTimFauHpzYk4C3sW=o-k+9yJP0iz1kWKXE9Brnzn@mail.gmail.com>
Date:	Wed, 28 Jul 2010 18:26:54 -0700
From:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bruce Allan <bruce.w.allan@...el.com>
Subject: Re: linux-next: manual merge of the net tree with the net-current 
	tree

On Wed, Jul 28, 2010 at 18:19, Stephen Rothwell <sfr@...b.auug.org.au> 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@...b.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 */
> --

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/