This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-devel] Re: linux-next: manual merge of the xen tree with the swiotl

To: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: [Xen-devel] Re: linux-next: manual merge of the xen tree with the swiotlb-xen tree
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Mon, 18 Oct 2010 01:11:57 -0700
Cc: Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>, Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>, Linus <torvalds@xxxxxxxxxxxxxxxxxxxx>
Delivery-date: Mon, 18 Oct 2010 01:13:38 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20101018155249.d9267bfe.sfr@xxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <20101018155249.d9267bfe.sfr@xxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv: Gecko/20100921 Fedora/3.1.4-1.fc13 Lightning/1.0b3pre Thunderbird/3.1.4
 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.


Xen-devel mailing list

<Prev in Thread] Current Thread [Next in Thread>