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_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
af_netlink.h	netlink: remove mmapped netlink support	2016-02-18 11:42:18 -05:00
diag.c	netlink: remove mmapped netlink support	2016-02-18 11:42:18 -05:00
genetlink.c	Revert "genl: Add genlmsg_new_unicast() for unicast message allocation"	2016-02-18 11:42:19 -05:00
Kconfig	netlink: remove mmapped netlink support	2016-02-18 11:42:18 -05:00
Makefile	netlink: Diag core and basic socket info dumping (v2)	2013-03-21 12:38:03 -04:00