linux-next: manual merge of the clockevents tree with the arm-soc tree

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 <redacted>
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 <redacted>
---
 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

-- 
Cheers,
Stephen Rothwell

Hi all,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell [off-list ref] wrote:

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 same
patches) :-(

-- 
Cheers,
Stephen Rothwell

On 07/11/2016 07:28 AM, Stephen Rothwell wrote:

Hi all,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell [off-list ref] wrote:

quoted

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 <redacted>
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 <redacted>
---
 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


-- 
 <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Hi All,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell [off-list ref] wrote:

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

Hi all,

On Wed, 27 Jul 2016 08:08:45 +1000 Stephen Rothwell [off-list ref] wrote:

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell [off-list ref] wrote:

quoted

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 <redacted>
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 <redacted>
---
 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.

This merge fix patch was missed when Linus merged the various bits of
the arm-soc tree overnight. :-(

Here is the merge fix patch again:

From: Stephen Rothwell <redacted>
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 <redacted>
---
 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

-- 
Cheers,
Stephen Rothwell

On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell [off-list ref] wrote:

This merge fix patch was missed when Linus merged the various bits of
the arm-soc tree overnight. :-(

Here is the merge fix patch again:

Thanks, applied.

          Linus

On Mon, Aug 1, 2016 at 9:26 PM, Linus Torvalds
[off-list ref] wrote:

Thanks, applied.

Gah, and I messed up the whitespace while doing so, so it looks a bit
odd. Sadly, I only noticed after having already pushed out (since I
had decided to just push out immediately as I don't build-test ARM
anyway).

Oh well,

              Linus