tree 1404248ebbec552a3fb7928b75322b65d74de1bd
parent 8cb2a7d5667ab9a9c2fdd356357b85b63b320901
parent fe0acb5fcb7fe8cb3d68bbdb8459865c972d8f83
author Pablo Neira Ayuso <pablo@netfilter.org> 1474838637 +0200
committer Pablo Neira Ayuso <pablo@netfilter.org> 1474839259 +0200

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 c73c24849011 ("netfilter: nf_tables_netdev: remove redundant
   ip_hdr assignment") from the net tree and commit ddc8b6027ad0
   ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()").

2) Between e8bffe0cf964 ("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>