From: Paolo Abeni Date: Tue, 7 Mar 2023 12:52:03 +0000 (+0100) Subject: Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf X-Git-Tag: v6.6-pxa1908~1697^2~15 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=775c73df905e4950ca11caabd592fd4b08aa93e2;p=linux.git Merge branch 'main' of git://git.kernel.org/pub/scm/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 --- 775c73df905e4950ca11caabd592fd4b08aa93e2