David S. Miller 1602f49b58 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>

2016-04-23 18:51:33 -04:00

..

af_packet.c

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

2016-04-23 18:51:33 -04:00

diag.c

netlink: make nlmsg_end() and genlmsg_end() void

2015-01-18 01:03:45 -05:00

internal.h

packet: add classic BPF fanout mode

2015-08-17 14:22:47 -07:00

Kconfig

packet: Diag core and basic socket info dumping

2012-08-14 16:56:33 -07:00

Makefile

packet: Diag core and basic socket info dumping

2012-08-14 16:56:33 -07:00