From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: Date: Fri, 6 Oct 2017 11:28:56 +0200 From: Simon Horman To: Arnd Bergmann Cc: Geert Uytterhoeven , Magnus Damm , Geert Uytterhoeven , "linux-arm-kernel@lists.infradead.org" , Linux-Renesas , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] ARM: shmobile: rcar-gen2: fix non-SMP build Message-ID: <20171006092856.GI7734@verge.net.au> References: <20171005120914.465582-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: On Thu, Oct 05, 2017 at 10:29:47PM +0200, Arnd Bergmann wrote: > On Thu, Oct 5, 2017 at 2:25 PM, Geert Uytterhoeven wrote: > > On Thu, Oct 5, 2017 at 2:09 PM, Arnd Bergmann wrote: > >> arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ > >> 1 file changed, 2 insertions(+) > >> > >> diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S > >> index db4743d2bf91..5672b5849401 100644 > >> --- a/arch/arm/mach-shmobile/headsmp-apmu.S > >> +++ b/arch/arm/mach-shmobile/headsmp-apmu.S > > > > As this hasn't been pulled into arm-soc yet (pull request sent though), > > perhaps Simon should squash this fix into the original commit? > > Should we rename headsmp-apmu.S to head-apmu.S? > > I'm fine with it either way, just do whatever works best for you here. My preference is to send a second pull request with this patch on top of the previous pull request. Arnd does that work for you? From mboxrd@z Thu Jan 1 00:00:00 1970 From: horms@verge.net.au (Simon Horman) Date: Fri, 6 Oct 2017 11:28:56 +0200 Subject: [PATCH] ARM: shmobile: rcar-gen2: fix non-SMP build In-Reply-To: References: <20171005120914.465582-1-arnd@arndb.de> Message-ID: <20171006092856.GI7734@verge.net.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Oct 05, 2017 at 10:29:47PM +0200, Arnd Bergmann wrote: > On Thu, Oct 5, 2017 at 2:25 PM, Geert Uytterhoeven wrote: > > On Thu, Oct 5, 2017 at 2:09 PM, Arnd Bergmann wrote: > >> arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ > >> 1 file changed, 2 insertions(+) > >> > >> diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S > >> index db4743d2bf91..5672b5849401 100644 > >> --- a/arch/arm/mach-shmobile/headsmp-apmu.S > >> +++ b/arch/arm/mach-shmobile/headsmp-apmu.S > > > > As this hasn't been pulled into arm-soc yet (pull request sent though), > > perhaps Simon should squash this fix into the original commit? > > Should we rename headsmp-apmu.S to head-apmu.S? > > I'm fine with it either way, just do whatever works best for you here. My preference is to send a second pull request with this patch on top of the previous pull request. Arnd does that work for you?