From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "H. Peter Anvin" <hpa@zytor•com>
Cc: Jeremy Fitzhardinge <jeremy@goop•org>,
Xen Devel <Xen-devel@lists•xensource.com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
Peter Zijlstra <peterz@infradead•org>
Subject: Re: linux-next: manual merge of the xen tree with the tip tree
Date: Fri, 26 Aug 2011 12:54:41 +1000 [thread overview]
Message-ID: <20110826125441.709aa423cdf072ce085fb91c@canb.auug.org.au> (raw)
In-Reply-To: <4E56D6E1.6030405@zytor.com>
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
On Thu, 25 Aug 2011 16:12:33 -0700 "H. Peter Anvin" <hpa@zytor•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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-08-26 2:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 4:24 linux-next: manual merge of the xen tree with the tip tree Stephen Rothwell
2011-08-25 18:13 ` Jeremy Fitzhardinge
2011-08-25 18:26 ` H. Peter Anvin
2011-08-25 23:06 ` Stephen Rothwell
2011-08-25 23:12 ` H. Peter Anvin
2011-08-26 2:54 ` Stephen Rothwell [this message]
2011-09-13 11:11 ` Stephen Rothwell
2011-09-13 15:07 ` Thomas Gleixner
2011-09-13 20:53 ` Jeremy Fitzhardinge
2011-09-13 20:56 ` Thomas Gleixner
2011-09-13 21:00 ` Jeremy Fitzhardinge
2011-09-14 0:32 ` Stephen Rothwell
2011-09-14 0:41 ` Jeremy Fitzhardinge
2011-09-14 0:48 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-10-22 3:03 Stephen Rothwell
2010-10-22 3:36 ` Stephen Rothwell
2010-10-22 4:03 ` Yinghai Lu
2010-10-22 8:01 ` Ingo Molnar
2010-10-22 18:39 ` Jeremy Fitzhardinge
2010-10-22 19:10 ` Jeremy Fitzhardinge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110826125441.709aa423cdf072ce085fb91c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=hpa@zytor$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox