| 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: <4E5693DD.2010307@zytor.com> Date: Thu, 25 Aug 2011 11:26:37 -0700 From: "H. Peter Anvin" <hpa@...or.com> To: Jeremy Fitzhardinge <jeremy@...p.org> CC: Stephen Rothwell <sfr@...b.auug.org.au>, Xen Devel <Xen-devel@...ts.xensource.com>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, Peter Zijlstra <peterz@...radead.org> Subject: Re: linux-next: manual merge of the xen tree with the tip tree On 08/25/2011 11:13 AM, Jeremy Fitzhardinge wrote: > On 08/24/2011 09:24 PM, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the xen tree got a conflict in >> arch/x86/include/asm/spinlock.h between a series of commits from the tip >> tree and a smaller series of similar commits from the xen tree. >> >> I see that Linus is commenting on these patches at the moment, and its >> not easy to resolve the conflicts, so I will just use the xen tree from >> next-20110824 for today. >> > > Thanks Stephen; the xen tree ones are more current, and I want to make > sure I didn't screw up any of the cmpxchg/xadd changes in a wider test env. > Stephen: the x86/spinlocks branch in the -tip tree is obsolete and should be dropped. -hpa -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists