David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

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

2015-10-24 06:54:12 -07:00

..

af_netlink.c

netlink: fix locking around NETLINK_LIST_MEMBERSHIPS

2015-10-22 07:18:28 -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