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
..
Kconfig	net/xfrm: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:03 -08:00
Makefile	xfrm: make xfrm_algo.c a module	2012-05-15 13:13:34 -04:00
xfrm_algo.c	ipsec: Replace seqniv with seqiv	2015-08-17 16:53:42 +08:00
xfrm_hash.c
xfrm_hash.h	xfrm: hash prefixed policies based on preflen thresholds	2014-09-02 13:29:44 +02:00
xfrm_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
xfrm_ipcomp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
xfrm_output.c	ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out	2015-10-08 04:27:02 -07:00
xfrm_policy.c	dst: Pass net into dst->output	2015-10-08 04:27:03 -07:00
xfrm_proc.c	net: clean up snmp stats code	2014-05-07 16:06:05 -04:00
xfrm_replay.c	xfrm: Always zero high-order sequence number bits	2015-05-21 06:56:23 +02:00
xfrm_state.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
xfrm_user.c	xfrm: Fix state threshold configuration from userspace	2015-09-29 11:45:55 +02:00