Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 4 Aug 2020 20:32:39 +0000 (13:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Aug 2020 20:32:39 +0000 (13:32 -0700)
commitee895a30ef463e3ebaa5cbe464346d9fbbce1860
tree00755eb8853e291fb9ed57d7f33630f77cebb9ad
parentbab9693a9a8c6dd19f670408ec1e78e12a320682
parent4203b19c27967d9eff6928f6a733f81892ffc592
Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Flush the cleanup xtables worker to make sure destructors
   have completed, from Florian Westphal.

2) iifgroup is matching erroneously, also from Florian.

3) Add selftest for meta interface matching, from Florian Westphal.

4) Move nf_ct_offload_timeout() to header, from Roi Dayan.

5) Call nf_ct_offload_timeout() from flow_offload_add() to
   make sure garbage collection does not evict offloaded flow,
   from Roi Dayan.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/netfilter/nf_tables.h
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_tables_api.c