From: Jakub Kicinski Date: Thu, 1 Dec 2022 06:01:28 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf X-Git-Tag: baikal/mips/sdk6.1~4304^2~51 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=3cb2e36e8ac411e22ab90041e8e6af58ebc4a625;p=kernel.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf Pablo Neira Ayuso says: ==================== Netfilter fixes for net 1) Check for interval validity in all concatenation fields in nft_set_pipapo, from Stefano Brivio. 2) Missing preemption disabled in conntrack and flowtable stat updates, from Xin Long. 3) Fix compilation warning when CONFIG_NF_CONNTRACK_MARK=n. Except for 3) which was a bug introduced in a recent fix in 6.1-rc - anything else, broken for several releases. * git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf: netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark netfilter: conntrack: fix using __this_cpu_add in preemptible netfilter: flowtable_offload: fix using __this_cpu_add in preemptible netfilter: nft_set_pipapo: Actually validate intervals in fields after the first one ==================== Link: https://lore.kernel.org/r/20221130121934.1125-1-pablo@netfilter.org Signed-off-by: Jakub Kicinski --- 3cb2e36e8ac411e22ab90041e8e6af58ebc4a625