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
cc590e9b02d1 ("netfilter: nf_tables_netdev: remove redundant
ip_hdr assignment") from the net tree and commit
b6556d1c3d4a
("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()").
2) Between
81d9888ab8be ("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>
projects / kernel.git / commit