Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following patchset contains the first batch of Netfilter updates for
the upcoming 4.5 kernel. This batch contains userspace netfilter header
compilation fixes, support for packet mangling in nf_tables, the new
tracing infrastructure for nf_tables and cgroup2 support for iptables.
More specifically, they are:

1) Two patches to include dependencies in our netfilter userspace
   headers to resolve compilation problems, from Mikko Rapeli.

2) Four comestic cleanup patches for the ebtables codebase, from Ian Morris.

3) Remove duplicate include in the netfilter reject infrastructure,
   from Stephen Hemminger.

4) Two patches to simplify the netfilter defragmentation code for IPv6,
   patch from Florian Westphal.

5) Fix root ownership of /proc/net netfilter for unpriviledged net
   namespaces, from Philip Whineray.

6) Get rid of unused fields in struct nft_pktinfo, from Florian Westphal.

7) Add mangling support to our nf_tables payload expression, from
   Patrick McHardy.

8) Introduce a new netlink-based tracing infrastructure for nf_tables,
   from Florian Westphal.

9) Change setter functions in nfnetlink_log to be void, from
    Rami Rosen.

10) Add netns support to the cttimeout infrastructure.

11) Add cgroup2 support to iptables, from Tejun Heo.

12) Introduce nfnl_dereference_protected() in nfnetlink, from Florian.

13) Add support for mangling pkttype in the nf_tables meta expression,
    also from Florian.

BTW, I need that you pull net into net-next, I have another batch that
requires changes that I don't yet see in net.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/nfnetlink.c
index 77afe91,aebf5cd..9ed4534
--- 1/net/netfilter/nfnetlink.c
--- 2/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@@ -295,9 -299,10 +299,8 @@@ replay
        if (!skb)
                return netlink_ack(oskb, nlh, -ENOMEM);
  
 -      skb->sk = oskb->sk;
 -
        nfnl_lock(subsys_id);
-       ss = rcu_dereference_protected(table[subsys_id].subsys,
-                                      lockdep_is_held(&table[subsys_id].mutex));
+       ss = nfnl_dereference_protected(subsys_id);
        if (!ss) {
  #ifdef CONFIG_MODULES
                nfnl_unlock(subsys_id);

diff --cc net/openvswitch/conntrack.c
Simple merge