From: David S. Miller Date: Wed, 12 Oct 2022 12:29:07 +0000 (+0100) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf X-Git-Tag: v6.1-rc5~182^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed5d1f61b4069c8b91a00ac29cfe1cef324e8bc2;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'master' of git://git./linux/kernel/git/netfilter/nf Florian Westphal says: ==================== netfilter fixes for net This series from Phil Sutter for the *net* tree fixes a problem with a change from the 6.1 development phase: the change to nft_fib should have used the more recent flowic_l3mdev field. Pointed out by Guillaume Nault. This also makes the older iptables module follow the same pattern. Also add selftest case and avoid test failure in nft_fib.sh when the host environment has set rp_filter=1. ==================== Signed-off-by: David S. Miller --- ed5d1f61b4069c8b91a00ac29cfe1cef324e8bc2