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

From	Ido Schimmel <idosch@idosch.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the net-next tree with the net tree
Date	2016-10-20 08:40 +0200
Message-ID	<sufbb-3SB-9@gated-at.bofh.it> (permalink)
References	<su95M-8vP-13@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Thu, Oct 20, 2016 at 11:01:42AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got conflicts in:
> 
>   include/linux/netdevice.h
>   net/core/dev.c
> 
> between commit:
> 
>   e4961b076885 ("net: core: Correctly iterate over lower adjacency list")
> 
> from the net tree and commit:
> 
>   1a3f060c1a47 ("net: Introduce new api for walking upper and lower devices")
>   f1170fd462c6 ("net: Remove all_adj_list and its references")
> 
> from the net-next tree.
> 
> I fixed it up (I just used the net-next tree version) and can carry the
> fix as necessary.

Yes, net-next is correct. Thanks Stephen!

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the net tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-20 02:10 +0200
  Re: linux-next: manual merge of the net-next tree with the net tree Ido Schimmel <idosch@idosch.org> - 2016-10-20 08:40 +0200

csiph-web