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!
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
