public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: linux-next: manual merge of the xen tree with Linus tree
Date: Tue, 17 May 2011 12:15:19 -0700	[thread overview]
Message-ID: <4DD2C947.9050501@goop.org> (raw)
In-Reply-To: <20110517211234.472e32f4.sfr@canb.auug.org.au>

On 05/17/2011 04:12 AM, Stephen Rothwell wrote:
> Hi Jeremy,
>
> On Sat, 15 Jan 2011 12:05:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the xen tree got a conflict in
>> drivers/xen/Kconfig, drivers/xen/gntdev.c and include/xen/gntdev.h
>> between various commits Linus' tree and various commits from the xen tree.
>>
>> As previously discussed, I have dropped the xen tree for today (as it
>> contains an older version of the changes that were merged into Linus'
>> tree).
> Just wondering if the xen tree is ever going to make a reappearance in
> linux-next?

Konrad's tree has the bulk of the xen work in it at the moment.  I'm
doing to start on a few bits and pieces, but I've not decided if I'll
put them into linux-next myself or just push them via Konrad.

So, maybe, but maybe not.

Thanks,
    J

  reply	other threads:[~2011-05-17 19:15 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2011-05-18 12:32     ` Ian Campbell
2011-05-18 14:33       ` Jeremy Fitzhardinge
2011-05-18 21:35         ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
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
2012-01-11 21:44   ` Jeremy Fitzhardinge
2012-01-11 22:45     ` Stephen Rothwell
2010-11-15  0:23 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=4DD2C947.9050501@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 \
    --cc=stefano.stabellini@eu.citrix.com \
    /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