Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760710Ab3D3Nyn (ORCPT ); Tue, 30 Apr 2013 09:54:43 -0400 Received: from smtp.citrix.com ([66.165.176.89]:40292 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760658Ab3D3Nym (ORCPT ); Tue, 30 Apr 2013 09:54:42 -0400 X-IronPort-AV: E=Sophos;i="4.87,582,1363132800"; d="scan'208";a="22373098" Date: Tue, 30 Apr 2013 14:54:38 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Stephen Rothwell CC: Stefano Stabellini , Catalin Marinas , Olof Johansson , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: linux-next: manual merge of the arm-soc tree with the xen-arm tree In-Reply-To: <20130430091845.27d8de4935bd33ddb4a3e8c0@canb.auug.org.au> Message-ID: References: <20130429175426.9423279609437a2d746cbb7b@canb.auug.org.au> <20130429082511.GA539@arm.com> <20130430091845.27d8de4935bd33ddb4a3e8c0@canb.auug.org.au> 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: 3403 Lines: 87 On Tue, 30 Apr 2013, Stephen Rothwell wrote: > Hi Stefano, > > On Mon, 29 Apr 2013 10:50:22 +0100 Stefano Stabellini wrote: > > > > On Mon, 29 Apr 2013, Catalin Marinas wrote: > > > > > > On Mon, Apr 29, 2013 at 08:54:26AM +0100, Stephen Rothwell wrote: > > > > Today's linux-next merge of the arm-soc tree got a conflict in > > > > arch/arm/mach-virt/platsmp.c between commit fe4bff02886b ("arm: introduce > > > > psci_smp_ops") from the xen-arm tree and commit c0114709ed85 ("irqchip: > > > > gic: Perform the gic_secondary_init() call via CPU notifier") from the > > > > arm-soc tree. > > > > > > > > The former renamed the file (and contents) so I applied the following > > > > patch and can carry the fix as necessary (no action is required). > > > > > > > > From: Stephen Rothwell > > > > Date: Mon, 29 Apr 2013 17:52:27 +1000 > > > > Subject: [PATCH] arm: fix for Perform the gic_secondary_init() call via CPU > > > > notifier > > > > > > > > due to code movement. > > > > > > > > Signed-off-by: Stephen Rothwell > > > > --- > > > > arch/arm/kernel/psci_smp.c | 7 ------- > > > > 1 file changed, 7 deletions(-) > > > > > > > > diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c > > > > index 6ef139d..cd9acc7 100644 > > > > --- a/arch/arm/kernel/psci_smp.c > > > > +++ b/arch/arm/kernel/psci_smp.c > > > > @@ -14,7 +14,6 @@ > > > > */ > > > > > > > > #include > > > > -#include > > > > #include > > > > #include > > > > > > > > @@ -55,11 +54,6 @@ static int __cpuinit psci_boot_secondary(unsigned int cpu, > > > > return -ENODEV; > > > > } > > > > > > > > -static void __cpuinit psci_secondary_init(unsigned int cpu) > > > > -{ > > > > - gic_secondary_init(0); > > > > -} > > > > - > > > > #ifdef CONFIG_HOTPLUG_CPU > > > > void __ref psci_cpu_die(unsigned int cpu) > > > > { > > > > @@ -84,7 +78,6 @@ bool __init psci_smp_available(void) > > > > } > > > > > > > > struct smp_operations __initdata psci_smp_ops = { > > > > - .smp_secondary_init = psci_secondary_init, > > > > .smp_boot_secondary = psci_boot_secondary, > > > > .cpu_die = psci_cpu_die, > > > > }; > > > > > > The fix looks fine. Thanks. > > > > Indeed, thanks! I'll add to it to the tree. > > You should not apply that to your tree as you don't have the rest of the > change from the arm-soc tree. It needs to be applied to the merge of the > two trees i.e. when Linus merges the last of the two trees. > > This is why I wrote "no action is required". I added the patch because it is very small and only affects psci_smp.c, so it is not a problem for me to carry it in the xen-arm tree. But I see your point, I'll remove it. As a side note for the arm-soc maintainers in CC, even though I proactively added the PSCI and the smp_init patches (http://marc.info/?l=linux-kernel&m=136716063717467&w=2) to linux-next to make sure they get enough exposure for this merge window, I would appreciate if you could pick them up in your tree. I think they should to Linus via arm-soc. -- 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/