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

Pablo Neira Ayuso says:

====================
Netfilter/IPVS updates for net-next

The following patchset contains Netfilter/IPVS updates for net-next:

1) Add support to specify a stateful expression in set definitions,
   this allows users to specify e.g. counters per set elements.

2) Flowtable software counter support.

3) Flowtable hardware offload counter support, from wenxu.

3) Parallelize flowtable hardware offload requests, from Paul Blakey.
   This includes a patch to add one work entry per offload command.

4) Several patches to rework nf_queue refcount handling, from Florian
   Westphal.

4) A few fixes for the flowtable tunnel offload: Fix crash if tunneling
   information is missing and set up indirect flow block as TC_SETUP_FT,
   patch from wenxu.

5) Stricter netlink attribute sanity check on filters, from Romain Bellan
   and Florent Fourcot.

5) Annotations to make sparse happy, from Jules Irenge.

6) Improve icmp errors in debugging information, from Haishuang Yan.

7) Fix warning in IPVS icmp error debugging, from Haishuang Yan.

8) Fix endianess issue in tcp extension header, from Sergey Marinkevich.
====================

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

diff --cc include/net/flow_offload.h
Simple merge

diff --cc net/netfilter/nf_flow_table_core.c
index d523c2a,9399bb2..c0cb794
--- 1/net/netfilter/nf_flow_table_core.c
--- 2/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@@ -613,11 -613,7 +613,10 @@@ void nf_flow_table_free(struct nf_flowt
        nf_flow_table_iterate(flow_table, nf_flow_table_do_cleanup, NULL);
        nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, flow_table);
        nf_flow_table_offload_flush(flow_table);
 +      if (nf_flowtable_hw_offload(flow_table))
 +              nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step,
 +                                    flow_table);
        rhashtable_destroy(&flow_table->rhashtable);
-       mutex_destroy(&flow_table->flow_block_lock);
  }
  EXPORT_SYMBOL_GPL(nf_flow_table_free);
  

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

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

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

diff --cc net/sched/cls_api.c
Simple merge