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,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: linux-next: manual merge of the xen tree with Linus' tree
Date: Thu, 12 Jan 2012 08:29:29 +1100 [thread overview]
Message-ID: <4F0DFF39.8090103@goop.org> (raw)
In-Reply-To: <20120111145709.77ef7d68996cd5fa724326e5@canb.auug.org.au>
On 01/11/2012 02:57 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen tree got a conflict in
> arch/x86/xen/Kconfig between commit 10fe570fc167 ("Revert "xen/debug:
> WARN_ON when identity PFN has no _PAGE_IOMAP flag set."") from Linus'
> tree and commit 23757fb5d678 ("xen: add CPU microcode update driver")
> from the xen tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Do you know which branch this is coming from? Are you by some chance
still (or again) pulling from my "git://github.com/jsgf/linux-xen.git
upstream/xen" repo, which contains a number of obsolete changes,
including the microcode stuff (now removed)?
I just created a new (empty)
"git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
upstream/linux-next" branch; could you make sure that replaces any other
branch you have from either kernel.org xen.git or github.com/jsgf/linux-xen?
Thanks,
J
next prev parent reply other threads:[~2012-01-11 21:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 3:57 linux-next: manual merge of the xen tree with Linus' tree Stephen Rothwell
2012-01-11 15:29 ` Ingo Molnar
2012-01-11 21:29 ` Jeremy Fitzhardinge [this message]
2012-01-11 21:44 ` Jeremy Fitzhardinge
2012-01-11 22:45 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-01-15 1:05 linux-next: manual merge of the xen tree with Linus tree Stephen Rothwell
2011-05-17 11:12 ` Stephen Rothwell
2011-05-17 19:15 ` Jeremy Fitzhardinge
2011-05-18 12:32 ` Ian Campbell
2011-05-18 14:33 ` Jeremy Fitzhardinge
2011-05-18 21:35 ` Stephen Rothwell
2010-11-15 0:23 linux-next: manual merge of the xen tree with Linus' tree Stephen Rothwell
2010-11-15 21:04 ` Jeremy Fitzhardinge
2010-11-15 21:07 ` Jens Axboe
2010-11-22 20:15 ` Jeremy Fitzhardinge
2010-11-22 20:17 ` Jens Axboe
2010-11-22 20:21 ` Jeremy Fitzhardinge
2010-10-27 1:00 Stephen Rothwell
2010-07-27 3:32 Stephen Rothwell
2010-07-27 6:08 ` 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=4F0DFF39.8090103@goop.org \
--to=jeremy@goop.org \
--cc=Xen-devel@lists.xensource.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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