On Mon, 2016-04-18 at 11:31 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/ipv4/udp.c
>
> between commit:
>
> d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets")
>
> from the net tree and commit:
>
> ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU")
>
> from the net-next tree.
>
> I tried to fixed it up (see below). Unfortunately,
> hlist_add_tail_rcu() does not exist. So instead I have reverted commit
> d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets") for
> today.
Hi Stephen
Craig warned that this would happen indeed, and provided a net-next
patch, to help David with this conflict.
https://patchwork.ozlabs.org/patch/611093/
Thanks
--
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
