From: Paolo Abeni Date: Thu, 17 Apr 2025 13:20:41 +0000 (+0200) Subject: Merge tag 'nf-25-04-17' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf X-Git-Tag: v6.15-rc3~33^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e57ce3c3225c163bea74a08bd0d18f7f3284f82;p=thirdparty%2Flinux.git Merge tag 'nf-25-04-17' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf Pablo Neira Ayuso says: ==================== Netfilter fix for net The following batch contains one Netfilter fix for net: 1) conntrack offload bit is erroneously unset in a race scenario, from Florian Westphal. netfilter pull request 25-04-17 * tag 'nf-25-04-17' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf: netfilter: conntrack: fix erronous removal of offload bit ==================== Link: https://patch.msgid.link/20250417102847.16640-1-pablo@netfilter.org Signed-off-by: Paolo Abeni --- 8e57ce3c3225c163bea74a08bd0d18f7f3284f82