projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1c5fae9 664899e)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2021 23:55:59 +0000 (15:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2021 23:55:59 +0000 (15:55 -0800)
commit450bbc3395185963b133177a9ddae305dae7c5fa
tree6a7f648b967531b188336fb8bc0be1af3e4f3034tree | snapshot
parent1c5fae9c9a092574398a17facc31c533791ef232commit | diff
parent664899e85c1312e51d2761e7f8b2f25d053e8489commit | diff
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>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git