Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
authorPaolo Abeni <pabeni@redhat.com>
Tue, 7 Mar 2023 12:52:03 +0000 (13:52 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 7 Mar 2023 12:52:04 +0000 (13:52 +0100)
commit775c73df905e4950ca11caabd592fd4b08aa93e2
treef9e59291f6abb6f3fae139e95171b6e42bb4a339
parent757b56a6c7bbaed0d005b60b3996ee5a04cf2d8d
parentc77737b736ceb50fdf150434347dbd81ec76dbb1
Merge branch 'main' of git://git./linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says:

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

The following patchset contains Netfilter fixes for net:

1) Restore ctnetlink zero mark in events and dump, from Ivan Delalande.

2) Fix deadlock due to missing disabled bh in tproxy, from Florian Westphal.

3) Safer maximum chain load in conntrack, from Eric Dumazet.

* 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: conntrack: adopt safer max chain length
  netfilter: tproxy: fix deadlock due to missing BH disable
  netfilter: ctnetlink: revert to dumping mark regardless of event type
====================

Link: https://lore.kernel.org/r/20230307100424.2037-1-pablo@netfilter.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>