From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932420AbcGZWIu (ORCPT ); Tue, 26 Jul 2016 18:08:50 -0400 Received: from ozlabs.org ([103.22.144.67]:46188 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549AbcGZWIs (ORCPT ); Tue, 26 Jul 2016 18:08:48 -0400 Date: Wed, 27 Jul 2016 08:08:45 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , Cc: Daniel Lezcano , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Shiyan , Linus Subject: Re: linux-next: manual merge of the clockevents tree with the arm-soc tree Message-ID: <20160727080845.12b58ebe@canb.auug.org.au> In-Reply-To: <20160707141226.2b9c1e15@canb.auug.org.au> References: <20160707141226.2b9c1e15@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi All, On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell wrote: > > Hi Daniel, > > Today's linux-next merge of the clockevents tree got a conflict in: > > arch/arm/Kconfig > > between commit: > > c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM") > > from the arm-soc tree and commit: > > 250e46aa3bb3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") > > from the clockevents tree. > > I fixed it up (I used the arm-soc version of this file and then added > the following merge fix patch) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > From: Stephen Rothwell > Date: Thu, 7 Jul 2016 13:59:06 +1000 > Subject: [PATCH] clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM" > > Signed-off-by: Stephen Rothwell > --- > arch/arm/mach-clps711x/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig > index 3b56197ccfd0..dc7c6edeab39 100644 > --- a/arch/arm/mach-clps711x/Kconfig > +++ b/arch/arm/mach-clps711x/Kconfig > @@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X > depends on ARCH_MULTI_V4T > select ARCH_REQUIRE_GPIOLIB > select AUTO_ZRELADDR > - select CLKSRC_MMIO > select CLKSRC_OF > + select CLPS711X_TIMER > select COMMON_CLK > select CPU_ARM720T > select GENERIC_CLOCKEVENTS > -- > 2.8.1 Since Linus has merged most of the tip tree now, this merge fixup is required when (part of) the arm-soc tree is moerged with Linus' tree. -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the clockevents tree with the arm-soc tree Date: Wed, 27 Jul 2016 08:08:45 +1000 Message-ID: <20160727080845.12b58ebe@canb.auug.org.au> References: <20160707141226.2b9c1e15@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:46188 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549AbcGZWIs (ORCPT ); Tue, 26 Jul 2016 18:08:48 -0400 In-Reply-To: <20160707141226.2b9c1e15@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Cc: Daniel Lezcano , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Shiyan , Linus Hi All, On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell wrote: > > Hi Daniel, > > Today's linux-next merge of the clockevents tree got a conflict in: > > arch/arm/Kconfig > > between commit: > > c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM") > > from the arm-soc tree and commit: > > 250e46aa3bb3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") > > from the clockevents tree. > > I fixed it up (I used the arm-soc version of this file and then added > the following merge fix patch) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > From: Stephen Rothwell > Date: Thu, 7 Jul 2016 13:59:06 +1000 > Subject: [PATCH] clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM" > > Signed-off-by: Stephen Rothwell > --- > arch/arm/mach-clps711x/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig > index 3b56197ccfd0..dc7c6edeab39 100644 > --- a/arch/arm/mach-clps711x/Kconfig > +++ b/arch/arm/mach-clps711x/Kconfig > @@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X > depends on ARCH_MULTI_V4T > select ARCH_REQUIRE_GPIOLIB > select AUTO_ZRELADDR > - select CLKSRC_MMIO > select CLKSRC_OF > + select CLPS711X_TIMER > select COMMON_CLK > select CPU_ARM720T > select GENERIC_CLOCKEVENTS > -- > 2.8.1 Since Linus has merged most of the tip tree now, this merge fixup is required when (part of) the arm-soc tree is moerged with Linus' tree. -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: sfr@canb.auug.org.au (Stephen Rothwell) Date: Wed, 27 Jul 2016 08:08:45 +1000 Subject: linux-next: manual merge of the clockevents tree with the arm-soc tree In-Reply-To: <20160707141226.2b9c1e15@canb.auug.org.au> References: <20160707141226.2b9c1e15@canb.auug.org.au> Message-ID: <20160727080845.12b58ebe@canb.auug.org.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi All, On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell wrote: > > Hi Daniel, > > Today's linux-next merge of the clockevents tree got a conflict in: > > arch/arm/Kconfig > > between commit: > > c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM") > > from the arm-soc tree and commit: > > 250e46aa3bb3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") > > from the clockevents tree. > > I fixed it up (I used the arm-soc version of this file and then added > the following merge fix patch) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > From: Stephen Rothwell > Date: Thu, 7 Jul 2016 13:59:06 +1000 > Subject: [PATCH] clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM" > > Signed-off-by: Stephen Rothwell > --- > arch/arm/mach-clps711x/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig > index 3b56197ccfd0..dc7c6edeab39 100644 > --- a/arch/arm/mach-clps711x/Kconfig > +++ b/arch/arm/mach-clps711x/Kconfig > @@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X > depends on ARCH_MULTI_V4T > select ARCH_REQUIRE_GPIOLIB > select AUTO_ZRELADDR > - select CLKSRC_MMIO > select CLKSRC_OF > + select CLPS711X_TIMER > select COMMON_CLK > select CPU_ARM720T > select GENERIC_CLOCKEVENTS > -- > 2.8.1 Since Linus has merged most of the tip tree now, this merge fixup is required when (part of) the arm-soc tree is moerged with Linus' tree. -- Cheers, Stephen Rothwell