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
..
ip_set_bitmap_gen.h	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_bitmap_ip.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_bitmap_ipmac.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_bitmap_port.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_core.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
ip_set_getport.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_gen.h	netfilter: ipset: Out of bound access in hash:net* types fixed	2015-08-28 18:51:30 +02:00
ip_set_hash_ip.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_ipmark.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_ipport.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_ipportip.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_ipportnet.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_mac.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_net.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_netiface.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_netnet.c	netfilter: ipset: Fixing unnamed union init	2015-08-29 01:02:28 +02:00
ip_set_hash_netport.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
ip_set_hash_netportnet.c	netfilter: ipset: Fixing unnamed union init	2015-08-29 01:02:28 +02:00
ip_set_list_set.c	netfilter: ipset: Fix sleeping memory allocation in atomic context	2015-10-17 13:01:24 +02:00
Kconfig
Makefile
pfxlen.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00