From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: Re: linux-next: manual merge of the xen tree with Linus tree Date: Wed, 18 May 2011 07:33:46 -0700 Message-ID: <4DD3D8CA.90509@goop.org> References: <20110115120544.98a1f091.sfr@canb.auug.org.au> <20110517211234.472e32f4.sfr@canb.auug.org.au> <4DD2C947.9050501@goop.org> <1305721938.20907.132.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: Received: from claw.goop.org ([74.207.240.146]:47371 "EHLO claw.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757065Ab1EROds (ORCPT ); Wed, 18 May 2011 10:33:48 -0400 In-Reply-To: <1305721938.20907.132.camel@zakaz.uk.xensource.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Ian Campbell Cc: Stephen Rothwell , Xen Devel , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini , Konrad Rzeszutek Wilk On 05/18/2011 05:32 AM, Ian Campbell wrote: > 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? Ah, good point. I've reset it back to v2.6.38 for now. J