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
..
Kconfig	…
Makefile	…
ebt_802_3.c	…
ebt_among.c	…
ebt_arp.c	…
ebt_arpreply.c	…
ebt_dnat.c	…
ebt_ip.c	…
ebt_ip6.c	…
ebt_limit.c	…
ebt_log.c	netfilter: nft_log: complete NFTA_LOG_FLAGS attr support	2016-09-25 23:16:43 +02:00
ebt_mark.c	…
ebt_mark_m.c	…
ebt_nflog.c	…
ebt_pkttype.c	…
ebt_redirect.c	netfilter: Remove explicit rcu_read_lock in nf_hook_slow	2016-09-24 21:29:53 +02:00
ebt_snat.c	…
ebt_stp.c	…
ebt_vlan.c	…
ebtable_broute.c	…
ebtable_filter.c	…
ebtable_nat.c	…
ebtables.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
nf_log_bridge.c	…
nf_tables_bridge.c	netfilter: Add the missed return value check of nft_register_chain_type	2016-09-12 19:54:45 +02:00
nft_meta_bridge.c	…
nft_reject_bridge.c	netfilter: nf_tables_bridge: use nft_set_pktinfo_ipv{4, 6}_validate	2016-09-12 18:52:15 +02:00