lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 18 May 2019 18:15:33 -0700 (PDT) From: David Miller <davem@...emloft.net> To: fw@...len.de Cc: netdev@...r.kernel.org, pablo@...filter.org Subject: Re: [PATCH net] kselftests: netfilter: fix leftover net/net-next merge conflict From: Florian Westphal <fw@...len.de> 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 <fw@...len.de> > --- > David, could you please take this directly? Done, thanks Florian.
Powered by blists - more mailing lists