Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933023Ab1ERMcm (ORCPT ); Wed, 18 May 2011 08:32:42 -0400 Received: from aaar.vm.bytemark.co.uk ([80.68.92.230]:50688 "EHLO aaar.vm.bytemark.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932738Ab1ERMck (ORCPT ); Wed, 18 May 2011 08:32:40 -0400 From: Ian Campbell To: Jeremy Fitzhardinge Cc: Stephen Rothwell , Xen Devel , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini , Konrad Rzeszutek Wilk In-Reply-To: <4DD2C947.9050501@goop.org> References: <20110115120544.98a1f091.sfr@canb.auug.org.au> <20110517211234.472e32f4.sfr@canb.auug.org.au> <4DD2C947.9050501@goop.org> Content-Type: text/plain; charset="UTF-8" Date: Wed, 18 May 2011 13:32:18 +0100 Message-ID: <1305721938.20907.132.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 62.200.22.2 X-SA-Exim-Mail-From: ijc@hellion.org.uk Subject: Re: linux-next: manual merge of the xen tree with Linus tree X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1431 Lines: 36 On Tue, 2011-05-17 at 12:15 -0700, Jeremy Fitzhardinge wrote: > On 05/17/2011 04:12 AM, Stephen Rothwell wrote: > > Hi Jeremy, > > > > On Sat, 15 Jan 2011 12:05:44 +1100 Stephen Rothwell 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. Perhaps resetting your branch to some commit on Linus tree in the meantime would mean Stephen doesn't have to see it everyday? Ian. -- Ian Campbell Current Noise: Devin Townsend - Away In an orderly world, there's always a place for the disorderly. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/