From: Florian Westphal <[email protected]>
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 needed.
>
> Fixes: 8b4483658364f0 ("Merge
> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
> Signed-off-by: Florian Westphal <[email protected]>
> ---
> David, could you please take this directly?
Done, thanks Florian.
