David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
af_netlink.c	netlink: Trim skb to alloc size to avoid MSG_TRUNC	2015-10-18 19:34:12 -07:00
af_netlink.h	netlink: Replace rhash_portid with bound	2015-09-24 12:07:08 -07:00
diag.c	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
genetlink.c	net/netlink: lockdep_genl_is_held can be boolean	2015-10-09 07:48:59 -07:00
Kconfig	netlink: kconfig: move mmap i/o into netlink kconfig	2013-05-01 15:02:42 -04:00
Makefile	netlink: Diag core and basic socket info dumping (v2)	2013-03-21 12:38:03 -04:00