Pablo Neira Ayuso f20fbc0717 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... Conflicts: net/netfilter/core.c net/netfilter/nf_tables_netdev.c Resolve two conflicts before pull request for David's net-next tree: 1) Between c73c248490 ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment") from the net tree and commit ddc8b6027a ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()"). 2) Between e8bffe0cf9 ("net: Add _nf_(un)register_hooks symbols") and Aaron Conole's patches to replace list_head with single linked list. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2016-09-25 23:34:19 +02:00
..
conntrack.h	netfilter: remove ip_conntrack* sysctl compat code	2016-08-13 13:27:13 +02:00
core.h	percpu: add __percpu sparse annotations to net	2010-02-16 23:05:38 -08:00
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: Remove fib_local variable	2016-08-09 14:57:39 -07:00
ipv6.h	ipv6: per netns FIB garbage collection	2016-03-08 15:16:51 -05:00
mib.h	net: use IS_ENABLED(CONFIG_IPV6)	2011-12-11 18:25:16 -05:00
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: replace list_head with single linked list	2016-09-25 14:38:48 +02:00
nftables.h	netfilter: nf_tables: add netdev table to filter from ingress	2015-05-26 18:41:23 +02:00
packet.h	packet: fix broken build.	2012-08-23 09:29:45 -07:00
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	xfrm: state: remove per-netns gc task	2016-08-24 13:16:06 +02:00