Re: [PATCH net] kselftests: netfilter: fix leftover net/net-next merge conflict

2019-05-18 Thread David Miller
From: Florian Westphal Date: Sat, 18 May 2019 23:33:35 +0200 > 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 nee

[PATCH net] kselftests: netfilter: fix leftover net/net-next merge conflict

2019-05-18 Thread Florian Westphal
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/ker