From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753256Ab1HYXNV (ORCPT ); Thu, 25 Aug 2011 19:13:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54903 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750898Ab1HYXNT (ORCPT ); Thu, 25 Aug 2011 19:13:19 -0400 Message-ID: <4E56D6E1.6030405@zytor.com> Date: Thu, 25 Aug 2011 16:12:33 -0700 From: "H. Peter Anvin" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20110816 Thunderbird/6.0 MIME-Version: 1.0 To: Stephen Rothwell CC: Jeremy Fitzhardinge , Xen Devel , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Peter Zijlstra Subject: Re: linux-next: manual merge of the xen tree with the tip tree References: <20110825142450.c84e02d8763cfd1a93411844@canb.auug.org.au> <4E5690C3.2050706@goop.org> <4E5693DD.2010307@zytor.com> <20110826090619.7588d424798f53a6f3621eb2@canb.auug.org.au> In-Reply-To: <20110826090619.7588d424798f53a6f3621eb2@canb.auug.org.au> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. -hpa