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
..
arp_tables.c
arpt_mangle.c
arptable_filter.c
ip_tables.c	netfilter: nft_log: complete NFTA_LOG_FLAGS attr support	2016-09-25 23:16:43 +02:00
ipt_ah.c
ipt_CLUSTERIP.c
ipt_ECN.c
ipt_MASQUERADE.c
ipt_REJECT.c
ipt_rpfilter.c
ipt_SYNPROXY.c
iptable_filter.c
iptable_mangle.c
iptable_nat.c
iptable_raw.c
iptable_security.c
Kconfig
Makefile
nf_conntrack_l3proto_ipv4.c
nf_conntrack_proto_icmp.c
nf_defrag_ipv4.c
nf_dup_ipv4.c
nf_log_arp.c	netfilter: nft_log: complete NFTA_LOG_FLAGS attr support	2016-09-25 23:16:43 +02:00
nf_log_ipv4.c	netfilter: nf_log: get rid of XT_LOG_* macros	2016-09-25 23:16:45 +02:00
nf_nat_h323.c
nf_nat_l3proto_ipv4.c
nf_nat_masquerade_ipv4.c
nf_nat_pptp.c
nf_nat_proto_gre.c
nf_nat_proto_icmp.c
nf_nat_snmp_basic.c
nf_reject_ipv4.c
nf_tables_arp.c
nf_tables_ipv4.c
nft_chain_nat_ipv4.c
nft_chain_route_ipv4.c
nft_dup_ipv4.c
nft_masq_ipv4.c
nft_redir_ipv4.c
nft_reject_ipv4.c