projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ee8a2b9) | patch
kselftests: netfilter: fix leftover net/net-next merge conflict
authorFlorian Westphal <fw@strlen.de>
Sat, 18 May 2019 21:33:35 +0000 (23:33 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 19 May 2019 01:15:13 +0000 (18:15 -0700)
commitc50a42b8f61f3492a0d3a1c7fb4932e19cf3e626
tree1b2fb4d0faf1bbf7a04189fdcedab47fbca1858dtree
parentee8a2b95b737d5989efeb477d5a1ef5e6955b830commit | diff
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>
tools/testing/selftests/netfilter/nft_nat.sh diff | blob | history
MicroBlaze GIT Repository