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>,
Andrew Morton <akpm@linux-foundation.org>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the xen tree with the swiotlb-xen tree
Date: Mon, 18 Oct 2010 01:11:57 -0700 [thread overview]
Message-ID: <4CBC014D.7070302@goop.org> (raw)
In-Reply-To: <20101018155249.d9267bfe.sfr@canb.auug.org.au>
On 10/17/2010 09:52 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen tree got conplex conflicts in
> drivers/xen/events.c between several commits from the swiotlb-xen tree
> and several commits from the xen tree.
>
> I am unqualified to fix this mess, sorry. I am dropping the xen tree
> for today (and only not dropping the swiotlb-xen tree because that would
> be too much work).
Argh, sorry, I should have coordinated with Konrad. I'd merged my tree
into linux-next to make sure it was OK, but I guess I overlooked something.
> I wonder, of course, why I have seen nothing in either of these trees
> until today (less than a week before the merge window opens).
I had found Xen regressions that had made it into linux-next and wanted
to sort those out before adding anything else to the mix.
> Please sort this mess out. I will drop the swiotlb-xen tree as well
> tomorrow if nothing has changed.
Will do.
Thanks,
J
next prev parent reply other threads:[~2010-10-18 8:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-18 4:52 linux-next: manual merge of the xen tree with the swiotlb-xen tree Stephen Rothwell
2010-10-18 8:11 ` Jeremy Fitzhardinge [this message]
2010-10-18 13:55 ` Konrad Rzeszutek Wilk
2010-10-18 14:49 ` Stephen Rothwell
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=4CBC014D.7070302@goop.org \
--to=jeremy@goop.org \
--cc=Xen-devel@lists.xensource.com \
--cc=akpm@linux-foundation.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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