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
| ||
|
Date: Wed, 1 Nov 2017 21:57:10 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Peter Zijlstra <peterz@...radead.org> Cc: Ingo Molnar <mingo@...nel.org>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, David Miller <davem@...emloft.net>, Networking <netdev@...r.kernel.org>, Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Yonghong Song <yhs@...com> Subject: Re: linux-next: manual merge of the tip tree with the net-next tree Hi Peter, On Wed, 1 Nov 2017 09:55:24 +0100 Peter Zijlstra <peterz@...radead.org> wrote: > > Hmm, I thought having that same base patch in both trees would allow it > to resolve that conflict. A well.. There is a difference between having he same patch and the same commit ... -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists