linux-kernel - Re: linux-next: manual merge of the xen tree with the tip tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110826125441.709aa423cdf072ce085fb91c@canb.auug.org.au>
Date:	Fri, 26 Aug 2011 12:54:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"H. Peter Anvin" <hpa@...or.com>
Cc:	Jeremy Fitzhardinge <jeremy@...p.org>,
	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 Thu, 25 Aug 2011 16:12:33 -0700 "H. Peter Anvin" <hpa@...or.com> wrote:
>
> On 08/25/2011 04:06 PM, Stephen Rothwell wrote:
> >>
> >> Stephen: the x86/spinlocks branch in the -tip tree is obsolete and
> >> should be dropped.
> > 
> > That's a bit tricky as I get a rolled up tip tree.  The best I could do
> > is revert the commit that merges the x86/spinlocks branch into
> > auto-latest ...  I'll do that for today (unless something happens to the
> > tip tree in the next hour).
> > 
> 
> OK, let me bother Ingo about it.

For today, I have done "git revert -m 1 6f8fa39c81f1" after merging the
tip tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped