David S. Miller fc14963f24 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for your net tree, they are: 1) Fix incorrect timestamp in nfnetlink_queue introduced when addressing y2038 safe timestamp, from Florian Westphal. 2) Get rid of leftover conntrack definition from the previous merge window, oneliner from Florian. 3) Make nf_queue handler pernet to resolve race on dereferencing the hook state structure with netns removal, from Eric Biederman. 4) Ensure clean exit on unregistered helper ports, from Taehee Yoo. 5) Restore FLOWI_FLAG_KNOWN_NH in nf_dup_ipv6. This got lost while generalizing xt_TEE to add packet duplication support in nf_tables, from Paolo Abeni. 6) Insufficient netlink NFTA_SET_TABLE attribute check in nf_tables_getset(), from Phil Turnbull. 7) Reject helper registration on duplicated ports via modparams. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2016-06-01 17:54:19 -07:00
..
conntrack.h	netfilter: conntrack: use single slab cache	2016-05-09 16:45:50 +02:00
core.h
dccp.h
generic.h	netns: remove BUG_ONs from net_generic()	2015-04-17 15:21:48 -04:00
hash.h	netns: constify net_hash_mix() and various callers	2015-03-18 22:00:34 -04:00
ieee802154_6lowpan.h	ieee802154: 6lowpan: ensure MTU of 1280 for 6lowpan	2014-08-19 19:17:42 +02:00
ipv4.h	net: ipv4: Consider failed nexthops in multipath routes	2016-04-11 15:16:13 -04:00
ipv6.h	ipv6: per netns FIB garbage collection	2016-03-08 15:16:51 -05:00
mib.h
mpls.h	mpls: Add a sysctl to control the size of the mpls label table	2015-03-04 00:26:06 -05:00
netfilter.h	netfilter: nf_queue: Make the queue_handler pernet	2016-05-25 11:54:22 +02:00
nftables.h	netfilter: nf_tables: add netdev table to filter from ingress	2015-05-26 18:41:23 +02:00
packet.h
sctp.h	net: sctp: dynamically enable or disable pf state	2015-12-16 10:56:50 -05:00
unix.h
x_tables.h	netfilter: don't pull include/linux/netfilter.h from netns headers	2015-06-18 21:14:31 +02:00
xfrm.h	flowcache: Avoid OOM condition under preasure	2016-03-17 10:28:42 +01:00