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
..
ip6_tables.c	netfilter: nft_log: complete NFTA_LOG_FLAGS attr support	2016-09-25 23:16:43 +02:00
ip6t_ah.c
ip6t_eui64.c
ip6t_frag.c
ip6t_hbh.c
ip6t_ipv6header.c
ip6t_MASQUERADE.c
ip6t_mh.c
ip6t_NPT.c
ip6t_REJECT.c
ip6t_rpfilter.c
ip6t_rt.c
ip6t_SYNPROXY.c	netfilter: ip6t_SYNPROXY: unnecessary to check whether ip6_route_output returns NULL	2016-04-25 15:34:30 +02:00
ip6table_filter.c	netfilter: xtables: don't hook tables by default	2016-03-02 20:05:24 +01:00
ip6table_mangle.c	netfilter: x_tables: simplify ip{6}table_mangle_hook()	2016-07-01 16:37:02 +02:00
ip6table_nat.c	netfilter: xtables: don't hook tables by default	2016-03-02 20:05:24 +01:00
ip6table_raw.c	netfilter: xtables: don't hook tables by default	2016-03-02 20:05:24 +01:00
ip6table_security.c	netfilter: xtables: don't hook tables by default	2016-03-02 20:05:24 +01:00
Kconfig
Makefile
nf_conntrack_l3proto_ipv6.c	netfilter: Remove explicit rcu_read_lock in nf_hook_slow	2016-09-24 21:29:53 +02:00
nf_conntrack_proto_icmpv6.c	netfilter: Remove explicit rcu_read_lock in nf_hook_slow	2016-09-24 21:29:53 +02:00
nf_conntrack_reasm.c
nf_defrag_ipv6_hooks.c
nf_dup_ipv6.c	netfilter: nf_dup_ipv6: set again FLOWI_FLAG_KNOWN_NH at flowi6_flags	2016-05-30 12:21:23 +02:00
nf_log_ipv6.c	netfilter: nf_log: get rid of XT_LOG_* macros	2016-09-25 23:16:45 +02:00
nf_nat_l3proto_ipv6.c	netfilter: Allow calling into nat helper without skb_dst.	2016-03-14 23:47:27 +01:00
nf_nat_masquerade_ipv6.c	netfilter: conntrack: resched in nf_ct_iterate_cleanup	2016-02-01 00:15:26 +01:00
nf_nat_proto_icmpv6.c
nf_reject_ipv6.c	netfilter: ipv6: unnecessary to check whether ip6_route_output() returns NULL	2016-04-07 18:53:08 +02:00
nf_tables_ipv6.c	netfilter: Add the missed return value check of nft_register_chain_type	2016-09-12 19:54:45 +02:00
nft_chain_nat_ipv6.c
nft_chain_route_ipv6.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-09-25 23:34:19 +02:00
nft_dup_ipv6.c
nft_masq_ipv6.c	netfilter: nft_masq: support port range	2016-03-02 20:05:27 +01:00
nft_redir_ipv6.c
nft_reject_ipv6.c	netfilter: nft_reject: restrict to INPUT/FORWARD/OUTPUT	2016-08-25 12:55:34 +02:00