Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next
authorJakub Kicinski <kuba@kernel.org>
Thu, 19 May 2022 23:06:33 +0000 (16:06 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 20 May 2022 04:53:08 +0000 (21:53 -0700)
commit805cb5aadc2a88c453cfe620b28e12ff2fac27a6
tree4092548cf74072313e9680a6f1fcfe0b2fec834b
parent16ea52c44e7a56c983a2a49e218af5a9dbbd8965
parent58a94a62a53ff76085f8b3face7d9b929b6a34ee
Merge git://git./linux/kernel/git/netfilter/nf-next

Pablo Neira Ayuso says:

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

The following patchset contains Netfilter updates for net-next, misc
updates and fallout fixes from recent Florian's code rewritting (from
last pull request):

1) Use new flowi4_l3mdev field in ip_route_me_harder(), from Martin Willi.

2) Avoid unnecessary GC with a timestamp in conncount, from William Tu
   and Yifeng Sun.

3) Remove TCP conntrack debugging, from Florian Westphal.

4) Fix compilation warning in ctnetlink, from Florian.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next:
  netfilter: ctnetlink: fix up for "netfilter: conntrack: remove unconfirmed list"
  netfilter: conntrack: remove pr_debug callsites from tcp tracker
  netfilter: nf_conncount: reduce unnecessary GC
  netfilter: Use l3mdev flow key when re-routing mangled packets
====================

Link: https://lore.kernel.org/r/20220519220206.722153-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>