From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the xen tree with the tip tree
Date: Thu, 25 Aug 2011 11:13:23 -0700 [thread overview]
Message-ID: <4E5690C3.2050706@goop.org> (raw)
In-Reply-To: <20110825142450.c84e02d8763cfd1a93411844@canb.auug.org.au>
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.
J
next prev parent reply other threads:[~2011-08-25 18:13 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 [this message]
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
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=4E5690C3.2050706@goop.org \
--to=jeremy@goop.org \
--cc=Xen-devel@lists.xensource.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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