diff options
| author |   Florian Westphal <fw@strlen.de> | 2019-05-18 23:33:35 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-18 18:15:13 -0700 |
| commit | c50a42b8f61f3492a0d3a1c7fb4932e19cf3e626 (patch) | |
| tree | 1b2fb4d0faf1bbf7a04189fdcedab47fbca1858d /net | |
| parent | Merge branch 'mlxsw-Two-port-module-fixes' (diff) | |
| download | linux-dev-c50a42b8f61f3492a0d3a1c7fb4932e19cf3e626.tar.xz linux-dev-c50a42b8f61f3492a0d3a1c7fb4932e19cf3e626.zip | |
kselftests: netfilter: fix leftover net/net-next merge conflict
In nf-next, I had extended this script to also cover NAT support for the
inet family.
In nf, I extended it to cover a regression with 'fully-random' masquerade.
Make this script work again by resolving the conflicts as needed.
Fixes: 8b4483658364f0 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions