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: Tue, 23 May 2017 09:37:22 +0100 From: Mark Rutland <mark.rutland@....com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Catalin Marinas <catalin.marinas@....com> Subject: Re: linux-next: manual merge of the tip tree with Linus' tree Hi Stephen, On Tue, May 23, 2017 at 07:44:56AM +1000, Stephen Rothwell wrote: > On Mon, 22 May 2017 09:32:15 +0100 Mark Rutland <mark.rutland@....com> wrote: > > > > Just to check, is your copy of tip up-to-date? > > Yes, it was fetched just before being merged. I use the auto-latest > branch of the tip tree which may not be as up to date as the master > branch. Thanks for the pointer; there was a stale copy there, which has now been zapped. Hopefully we're conflict-free for next-20170524. Thanks for the heads-up! Mark.
Powered by blists - more mailing lists