From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the xen-arm tree
Date: Tue, 30 Apr 2013 09:18:45 +1000 [thread overview]
Message-ID: <20130430091845.27d8de4935bd33ddb4a3e8c0@canb.auug.org.au> (raw)
In-Reply-To: <alpine.DEB.2.02.1304291049060.5398@kaball.uk.xensource.com>
[-- Attachment #1: Type: text/plain, Size: 2661 bytes --]
Hi Stefano,
On Mon, 29 Apr 2013 10:50:22 +0100 Stefano Stabellini <stefano.stabellini@eu.citrix.com> 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 <sfr@canb.auug.org.au>
> > > 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 <sfr@canb.auug.org.au>
> > > ---
> > > 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 <linux/init.h>
> > > -#include <linux/irqchip/arm-gic.h>
> > > #include <linux/smp.h>
> > > #include <linux/of.h>
> > >
> > > @@ -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".
And you committed it to your tree without your Signed-off-by ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-04-29 23:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-29 7:54 linux-next: manual merge of the arm-soc tree with the xen-arm tree Stephen Rothwell
2013-04-29 8:25 ` Catalin Marinas
2013-04-29 9:50 ` Stefano Stabellini
2013-04-29 23:18 ` Stephen Rothwell [this message]
2013-04-30 13:54 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130430091845.27d8de4935bd33ddb4a3e8c0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=stefano.stabellini@eu.citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).