]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'netfilter-followup-fixes-for-net'
authorJakub Kicinski <kuba@kernel.org>
Sat, 6 Aug 2022 01:50:26 +0000 (18:50 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 6 Aug 2022 01:50:27 +0000 (18:50 -0700)
Florian Westphal says:

====================
netfilter followup fixes for net

Regressions, since 5.19:
Fix crash when packet tracing is enabled via 'meta nftrace set 1' rule.
Also comes with a test case.

Regressions, this cycle:
Fix Kconfig dependency for the flowtable /proc interface, we want this
to be off by default.
====================

Link: https://lore.kernel.org/r/20220804172629.29748-1-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge