From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753695Ab0JTPQt (ORCPT ); Wed, 20 Oct 2010 11:16:49 -0400 Received: from smtp.eu.citrix.com ([62.200.22.115]:31954 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753531Ab0JTPQs (ORCPT ); Wed, 20 Oct 2010 11:16:48 -0400 X-IronPort-AV: E=Sophos;i="4.57,355,1283731200"; d="scan'208";a="2436941" Date: Wed, 20 Oct 2010 16:16:17 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball-desktop To: Stephen Rothwell CC: Stefano Stabellini , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk , "linux-next@vger.kernel.org" , Andrew Morton , Jeremy Fitzhardinge , Chris Wright , "virtualization@lists.osdl.org" , "xen-devel@lists.xensource.com" Subject: Re: xen PV on HVM and initial domain merge in linux-next In-Reply-To: <20101020113256.3647b1d9.sfr@canb.auug.org.au> Message-ID: References: <20101020113256.3647b1d9.sfr@canb.auug.org.au> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 20 Oct 2010, Stephen Rothwell wrote: > Hi Stefano, > > [just casting the net a bit wider ...] > > On Tue, 19 Oct 2010 18:51:47 +0100 Stefano Stabellini wrote: > > > > I forgot to CC the LKML and linux-next... > > > > On Tue, 19 Oct 2010, Stefano Stabellini wrote: > > > Stephen, > > > I have two patch series to merge in linux-next: > > > > > > PV on HVM: receive interrupts as xen events > > > xen: initial domain support > > > > > > they have all the acked-by needed and are both stable since several > > > weeks, however they depend on Konrad's xen-pcifront series and for this > > > reason I waited until now to ask for a merge in linux-next. > > > > > > Could you please pull: > > > > > > git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git linux-next-initial-domain-v4 > > > > > > it contains both series rebased on Konrad's pcifront series merged on > > > linux-next (warning: it still contains the merge commit of > > > xen-pcifront-0.8.2 in linux-next). > > > Let me know if you have any conflicts or if you need me to change the > > > branch somehow. > > Not following the Xen develpment at all, I would like to have a positive > reply from the listed Xen contacts, please, > Sure. Jeremy? > I do have concerns that this is turning up so late, but I realise that > that is mainly due to a misunderstanding on the part of some of the Xen > community. > Thank you very much for understanding! > Also, the above tree is based on next-20101019 which means that I cannot > use it as is. All the trees merged into linux-next must be base on some > other stable tree (almost always Linus' tree). linux-next is rebuilt > from scratch every day, so I cannot ever include a previous day's version. > > Merging in other stable trees is OK (as long as the other maintainer is > aware of that and makes sure that their tree does not reabse). > > Basically what you send to me should be what you intend to send to Linus > during the next merge window. All right. I merged Jeremy's and Konrad's branches (the ones you just merged on linux-next) on top of linux 2.6.36 rc8, then I rebased my series on top of the result. Please checkout this branch: git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git 2.6.36-rc8-initial-domain-v5 and let me know if it is suitable, it shouldn't have any merge conflicts. Cheers, Stefano