tree 4848fb0ffbc581ff465fd9c9e5a5b10b06f09b68
parent 22d37b6b0058365a80378ee6198d21e7f6c86327
parent 5f44abd041c5f3be76d57579ab254d78e601315b
author David S. Miller <davem@davemloft.net> 1461450384 -0400
committer David S. Miller <davem@davemloft.net> 1461451893 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

Signed-off-by: David S. Miller <davem@davemloft.net>