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

From: Stephen Rothwell
Date: Wed Oct 19 2016 - 20:01:49 EST

Hi all,

Today's linux-next merge of the net-next tree got conflicts in:


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. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

Stephen Rothwell