From: David S. Miller <davem@davemloft.net>
Date: Tue, 22 Jun 2021 17:52:40 +0000 (-0700)
Subject: Merge branch 'tc-testing-dnat-tuple-collision'
X-Git-Tag: v5.14-rc1~119^2~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f84974e75f539a814a0a0caee62df7cff23eb072;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'tc-testing-dnat-tuple-collision'

Marcelo Ricardo Leitner says:

====================
tc-testing: add test for ct DNAT tuple collision

That was fixed in 13c62f5371e3 ("net/sched: act_ct: handle DNAT tuple
collision").

For that, it requires that tdc is able to send diverse packets with
scapy, which is then done on the 2nd patch of this series.
====================

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

f84974e75f539a814a0a0caee62df7cff23eb072