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 linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20190708.195741.202712281331944867.davem@davemloft.net> Date: Mon, 08 Jul 2019 19:57:41 -0700 (PDT) From: David Miller <davem@...emloft.net> To: sfr@...b.auug.org.au Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, mcroce@...hat.com, fw@...len.de Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Tue, 9 Jul 2019 10:27:28 +1000 > I am still getting this conflict (the commit ids may have changed). > Just a reminder in case you think Linus may need to know. I'm resolving this right now, thanks Stephen.
Powered by blists - more mailing lists