From: David S. Miller <davem@davemloft.net>
Date: Tue, 9 Feb 2021 23:55:59 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v5.15~1825^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=450bbc3395185963b133177a9ddae305dae7c5fa;p=platform%2Fkernel%2Flinux-starfive.git

Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

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

The following patchset contains Netfilter fixes for net:

1) nf_conntrack_tuple_taken() needs to recheck zone for
   NAT clash resolution, from Florian Westphal.

2) Restore support for stateful expressions when set definition
   specifies no stateful expressions.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

450bbc3395185963b133177a9ddae305dae7c5fa