Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756809Ab3GVOqk (ORCPT ); Mon, 22 Jul 2013 10:46:40 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:61591 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756343Ab3GVOqi (ORCPT ); Mon, 22 Jul 2013 10:46:38 -0400 X-IronPort-AV: E=Sophos;i="4.89,719,1367971200"; d="scan'208";a="36592929" Date: Mon, 22 Jul 2013 15:46:34 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Mark Rutland CC: Stefano Stabellini , Julien Grall , "konrad.wilk@oracle.com" , "ian.campbell@citrix.com" , "patches@linaro.org" , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xen.org" , "linux-arm-kernel@lists.infradead.org" , Catalin Marinas Subject: Re: [PATCH v3] xen/arm: enable PV control for ARM In-Reply-To: <20130722143920.GC32221@e106331-lin.cambridge.arm.com> Message-ID: References: <1374490654-13373-1-git-send-email-julien.grall@linaro.org> <20130722134934.GB32221@e106331-lin.cambridge.arm.com> <20130722143920.GC32221@e106331-lin.cambridge.arm.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) 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 Content-Length: 2029 Lines: 48 On Mon, 22 Jul 2013, Mark Rutland wrote: > On Mon, Jul 22, 2013 at 03:09:35PM +0100, Stefano Stabellini wrote: > > On Mon, 22 Jul 2013, Mark Rutland wrote: > > > Hi, > > > > > > [Adding Catalin to Cc] > > > > > > On Mon, Jul 22, 2013 at 11:57:34AM +0100, Julien Grall wrote: > > > > Enable power management from the toolstack for ARM guest. > > > > > > > > Signed-off-by: Julien Grall > > > > > > > > --- > > > > Changes in v3: > > > > - Fix condition to compile cpu_hotplug.o > > > > Changes in v2: > > > > - Don't compile xen/cpu_hotplug.o with ARM64 > > > > > > My arm64 cpu hotplug series is going to be dependent on not compiling > > > xen/cpu_hotplug.o. Currently I'm not able to compile an arm64 kernel > > > with my patches and Xen support. > > > > > > How do you intend to push this? I'd like to ensure my cpu hotplug series > > > is able to go in for the next merge window. > > > > This patch does exactly that: it makes sure cpu_hotplug is not compiled > > on ARM64. > > Sorry, what I meant was that my series is going to be entirely dependent > on this patch or it'll break bisection. That'll make merging things a > little painful as I'll need a stable branch with this patch to base my > series upon. > > Another option would be to split this patch into two parts, one enabling > power management and one fixing things up for HOTPLUG_CPU on arm64. That > way I could take the arm64 HOTPLUG_CPU fix in my series adding arm64 > HOTPLUG_CPU support. > > Would that be acceptable? Have I missed something? As I am very sensitive to painful merging situations, I think we could split the patch in two and send upstream the fix (not compiling cpu_hotplug.o on ARM64) in 3.11-rc2 or rc3. Konrad, what do you think? -- 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/