From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884AbcGORHI (ORCPT ); Fri, 15 Jul 2016 13:07:08 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:36694 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545AbcGORHF (ORCPT ); Fri, 15 Jul 2016 13:07:05 -0400 Subject: Re: linux-next: manual merge of the clockevents tree with the arm-soc tree To: Stephen Rothwell , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra References: <20160707141226.2b9c1e15@canb.auug.org.au> <20160711152812.3efd7047@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Shiyan From: Daniel Lezcano Message-ID: <57891831.2080806@linaro.org> Date: Fri, 15 Jul 2016 19:06:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20160711152812.3efd7047@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/11/2016 07:28 AM, Stephen Rothwell wrote: > Hi all, > > On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell wrote: >> >> 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 > > This merge fix is now applicable to the merge between the arm-soc tree > and the tip tree. > > Also, the clockevents tree needs to be cleaned up as all its commits > have been added to the tip tree as different commits (but the s > patches) :-( I synced the branch with tip/timers/core, no more conflict should happen. Thanks. -- Daniel -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel.lezcano@linaro.org (Daniel Lezcano) Date: Fri, 15 Jul 2016 19:06:57 +0200 Subject: linux-next: manual merge of the clockevents tree with the arm-soc tree In-Reply-To: <20160711152812.3efd7047@canb.auug.org.au> References: <20160707141226.2b9c1e15@canb.auug.org.au> <20160711152812.3efd7047@canb.auug.org.au> Message-ID: <57891831.2080806@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 07/11/2016 07:28 AM, Stephen Rothwell wrote: > Hi all, > > On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell wrote: >> >> 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 > > This merge fix is now applicable to the merge between the arm-soc tree > and the tip tree. > > Also, the clockevents tree needs to be cleaned up as all its commits > have been added to the tip tree as different commits (but the s > patches) :-( I synced the branch with tip/timers/core, no more conflict should happen. Thanks. -- Daniel -- Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog