| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
[Xen-devel] Re: linux-next: manual merge of the xen tree with the tip tr
|
To: |
"H. Peter Anvin" <hpa@xxxxxxxxx> |
|
Subject: |
[Xen-devel] Re: linux-next: manual merge of the xen tree with the tip tree |
|
From: |
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|
Date: |
Fri, 26 Aug 2011 12:54:41 +1000 |
|
Cc: |
Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Ingo, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>, linux-next@xxxxxxxxxxxxxxx, Thomas Gleixner <tglx@xxxxxxxxxxxxx>, Molnar <mingo@xxxxxxx> |
|
Delivery-date: |
Thu, 25 Aug 2011 19:57:43 -0700 |
|
Envelope-to: |
www-data@xxxxxxxxxxxxxxxxxxx |
|
In-reply-to: |
<4E56D6E1.6030405@xxxxxxxxx> |
|
List-help: |
<mailto:xen-devel-request@lists.xensource.com?subject=help> |
|
List-id: |
Xen developer discussion <xen-devel.lists.xensource.com> |
|
List-post: |
<mailto:xen-devel@lists.xensource.com> |
|
List-subscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> |
|
List-unsubscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> |
|
References: |
<20110825142450.c84e02d8763cfd1a93411844@xxxxxxxxxxxxxxxx> <4E5690C3.2050706@xxxxxxxx> <4E5693DD.2010307@xxxxxxxxx> <20110826090619.7588d424798f53a6f3621eb2@xxxxxxxxxxxxxxxx> <4E56D6E1.6030405@xxxxxxxxx> |
|
Sender: |
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
On Thu, 25 Aug 2011 16:12:33 -0700 "H. Peter Anvin" <hpa@xxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
pgpzGg1jwPX4C.pgp
Description: PGP signature
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
|
|
| |
|
Home