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

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

[Stephen Rothwell]

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in:

  arch/arm/boot/dts/rk3188.dtsi

between commit:

  2e1aa605fadd ("ARM: dts: rockchip: fix PPI misconfiguration on Cortex-A9 socs")

from the arm-soc tree and commit:

  500d0aa918a2 ("ARM: dts: rockchip: disable arm-global-timer for rk3188")

from the clockevents tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/boot/dts/rk3188.dtsi
index fa1bdb8875ae,1aff4ad22fc4..000000000000
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@@ -529,7 -545,8 +545,8 @@@
  };
  
  &global_timer {
 -	interrupts = <GIC_PPI 11 0xf04>;
 +	interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+ 	status = "disabled";
  };
  
  &local_timer {

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

[Stephen Rothwell]

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in:

  arch/arm/boot/dts/rk3188.dtsi

between commit:

  2e1aa605fadd ("ARM: dts: rockchip: fix PPI misconfiguration on Cortex-A9 socs")

from the arm-soc tree and commit:

  500d0aa918a2 ("ARM: dts: rockchip: disable arm-global-timer for rk3188")

from the clockevents tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/boot/dts/rk3188.dtsi
index fa1bdb8875ae,1aff4ad22fc4..000000000000
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@@ -529,7 -545,8 +545,8 @@@
  };
  
  &global_timer {
 -	interrupts = <GIC_PPI 11 0xf04>;
 +	interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
+ 	status = "disabled";
  };
  
  &local_timer {

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

[Linus Torvalds]

On Mon, Aug 1, 2016 at 9:26 PM, Linus Torvalds
<torvalds@linux-foundation.org> 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

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

[Linus Torvalds]

On Mon, Aug 1, 2016 at 9:26 PM, Linus Torvalds
<torvalds@linux-foundation.org> 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

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

[Linus Torvalds]

On Mon, Aug 1, 2016 at 9:26 PM, Linus Torvalds
<torvalds@linux-foundation.org> 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

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

[Linus Torvalds]

On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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

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

[Linus Torvalds]

On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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

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

[Linus Torvalds]

On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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

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

[Stephen Rothwell]

Hi all,

On Wed, 27 Jul 2016 08:08:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> > 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 <sfr@canb.auug.org.au>
> > ---
> >  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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

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

[Stephen Rothwell]

Hi all,

On Wed, 27 Jul 2016 08:08:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> > 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 <sfr@canb.auug.org.au>
> > ---
> >  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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

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

[Stephen Rothwell]

Hi all,

On Wed, 27 Jul 2016 08:08:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> > 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 <sfr@canb.auug.org.au>
> > ---
> >  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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

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

[Stephen Rothwell]

Hi All,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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

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

[Stephen Rothwell]

Hi All,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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

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

[Stephen Rothwell]

Hi All,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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

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

[Daniel Lezcano]

On 07/11/2016 07:28 AM, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
>> 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 <sfr@canb.auug.org.au>
>> ---
>>  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

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

[Daniel Lezcano]

On 07/11/2016 07:28 AM, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
>> 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 <sfr@canb.auug.org.au>
>> ---
>>  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

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

[Stephen Rothwell]

Hi all,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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 same
patches) :-(

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi all,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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 same
patches) :-(

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi all,

On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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 same
patches) :-(

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

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

[Stephen Rothwell]

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

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

[Stephen Rothwell]

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

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

[Stephen Rothwell]

Hi Daniel,

Today's linux-next merge of the clockevents tree got conflicts in:

  arch/arm/Kconfig
  arch/arm/mach-mxs/Kconfig

between commit:

  5c34a4e89c74 ("ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")

from the arm-soc tree and commits:

  db01e25865a3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option")
  b37b0e101e59 ("clocksource/drivers/mxs: Add the COMPILE_TEST option")

from the clockevents tree.

Please keep select lines ordered if they appear to be already.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/Kconfig
index a0af11b90236,0c1f5468a8e7..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -354,8 -354,8 +354,8 @@@ config ARM_SINGLE_ARMV7
  
  config ARCH_CLPS711X
  	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
 -	select ARCH_REQUIRE_GPIOLIB
  	select AUTO_ZRELADDR
- 	select CLKSRC_MMIO
++	select CLPS711X_TIMER
  	select COMMON_CLK
  	select CPU_ARM720T
  	select GENERIC_CLOCKEVENTS
diff --cc arch/arm/mach-mxs/Kconfig
index 5d9e5fce7937,68a3a9ec605d..000000000000
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@@ -15,8 -15,8 +15,8 @@@ config SOC_IMX2
  config ARCH_MXS
  	bool "Freescale MXS (i.MX23, i.MX28) support"
  	depends on ARCH_MULTI_V5
- 	select CLKSRC_MMIO
 -	select ARCH_REQUIRE_GPIOLIB
 +	select GPIOLIB
+ 	select MXS_TIMER
  	select PINCTRL
  	select SOC_BUS
  	select SOC_IMX23

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

[Shawn Guo]

Hi Daniel,

On Mon, May 26, 2014 at 03:43:31PM +1000, Stephen Rothwell wrote:
> Hi Daniel,
> 
> Today's linux-next merge of the clockevents tree got a conflict in
> arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
> vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
> 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
> node") from the clockevents tree.

Next time, please leave the dts patches to go via arch tree, so that we
can save such conflicts.

Shawn

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

[Shawn Guo]

Hi Daniel,

On Mon, May 26, 2014 at 03:43:31PM +1000, Stephen Rothwell wrote:
> Hi Daniel,
> 
> Today's linux-next merge of the clockevents tree got a conflict in
> arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
> vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
> 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
> node") from the clockevents tree.

Next time, please leave the dts patches to go via arch tree, so that we
can save such conflicts.

Shawn

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

[Shawn Guo]

Hi Daniel,

On Mon, May 26, 2014 at 03:43:31PM +1000, Stephen Rothwell wrote:
> Hi Daniel,
> 
> Today's linux-next merge of the clockevents tree got a conflict in
> arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
> vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
> 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
> node") from the clockevents tree.

Next time, please leave the dts patches to go via arch tree, so that we
can save such conflicts.

Shawn

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

[Li.Xiubo]

> Subject: 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/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
> vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
> 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
> node") from the clockevents tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Acked-by: Xiubo Li <Li.Xiubo@freescale.com>

Thanks,

BRs
Xiubo

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/boot/dts/vf610.dtsi
> index 73355ddc5186,3c91b84066a1..000000000000
> --- a/arch/arm/boot/dts/vf610.dtsi
> +++ b/arch/arm/boot/dts/vf610.dtsi
> @@@ -360,17 -347,19 +360,30 @@@
>   				status = "disabled";
>   			};
> 
>  +			esdhc1: esdhc@400b2000 {
>  +				compatible = "fsl,imx53-esdhc";
>  +				reg = <0x400b2000 0x4000>;
>  +				interrupts = <0 28 0x04>;
>  +				clocks = <&clks VF610_CLK_IPG_BUS>,
>  +					<&clks VF610_CLK_PLATFORM_BUS>,
>  +					<&clks VF610_CLK_ESDHC1>;
>  +				clock-names = "ipg", "ahb", "per";
>  +				status = "disabled";
>  +			};
>  +
> + 			ftm: ftm@400b8000 {
> + 				compatible = "fsl,ftm-timer";
> + 				reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
> + 				interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
> + 				clock-names = "ftm-evt", "ftm-src",
> + 					"ftm-evt-counter-en", "ftm-src-counter-en";
> + 				clocks = <&clks VF610_CLK_FTM2>,
> + 					<&clks VF610_CLK_FTM3>,
> + 					<&clks VF610_CLK_FTM2_EXT_FIX_EN>,
> + 					<&clks VF610_CLK_FTM3_EXT_FIX_EN>;
> + 				status = "disabled";
> + 			};
> +
>   			fec0: ethernet@400d0000 {
>   				compatible = "fsl,mvf600-fec";
>   				reg = <0x400d0000 0x1000>;

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

[Li.Xiubo]

> Subject: 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/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
> vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
> 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
> node") from the clockevents tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Acked-by: Xiubo Li <Li.Xiubo@freescale.com>

Thanks,

BRs
Xiubo

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/boot/dts/vf610.dtsi
> index 73355ddc5186,3c91b84066a1..000000000000
> --- a/arch/arm/boot/dts/vf610.dtsi
> +++ b/arch/arm/boot/dts/vf610.dtsi
> @@@ -360,17 -347,19 +360,30 @@@
>   				status = "disabled";
>   			};
> 
>  +			esdhc1: esdhc@400b2000 {
>  +				compatible = "fsl,imx53-esdhc";
>  +				reg = <0x400b2000 0x4000>;
>  +				interrupts = <0 28 0x04>;
>  +				clocks = <&clks VF610_CLK_IPG_BUS>,
>  +					<&clks VF610_CLK_PLATFORM_BUS>,
>  +					<&clks VF610_CLK_ESDHC1>;
>  +				clock-names = "ipg", "ahb", "per";
>  +				status = "disabled";
>  +			};
>  +
> + 			ftm: ftm@400b8000 {
> + 				compatible = "fsl,ftm-timer";
> + 				reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
> + 				interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
> + 				clock-names = "ftm-evt", "ftm-src",
> + 					"ftm-evt-counter-en", "ftm-src-counter-en";
> + 				clocks = <&clks VF610_CLK_FTM2>,
> + 					<&clks VF610_CLK_FTM3>,
> + 					<&clks VF610_CLK_FTM2_EXT_FIX_EN>,
> + 					<&clks VF610_CLK_FTM3_EXT_FIX_EN>;
> + 				status = "disabled";
> + 			};
> +
>   			fec0: ethernet@400d0000 {
>   				compatible = "fsl,mvf600-fec";
>   				reg = <0x400d0000 0x1000>;

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

[Li.Xiubo at freescale.com]

> Subject: 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/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
> vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
> 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
> node") from the clockevents tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Acked-by: Xiubo Li <Li.Xiubo@freescale.com>

Thanks,

BRs
Xiubo

> --
> Cheers,
> Stephen Rothwell                    sfr at canb.auug.org.au
> 
> diff --cc arch/arm/boot/dts/vf610.dtsi
> index 73355ddc5186,3c91b84066a1..000000000000
> --- a/arch/arm/boot/dts/vf610.dtsi
> +++ b/arch/arm/boot/dts/vf610.dtsi
> @@@ -360,17 -347,19 +360,30 @@@
>   				status = "disabled";
>   			};
> 
>  +			esdhc1: esdhc at 400b2000 {
>  +				compatible = "fsl,imx53-esdhc";
>  +				reg = <0x400b2000 0x4000>;
>  +				interrupts = <0 28 0x04>;
>  +				clocks = <&clks VF610_CLK_IPG_BUS>,
>  +					<&clks VF610_CLK_PLATFORM_BUS>,
>  +					<&clks VF610_CLK_ESDHC1>;
>  +				clock-names = "ipg", "ahb", "per";
>  +				status = "disabled";
>  +			};
>  +
> + 			ftm: ftm at 400b8000 {
> + 				compatible = "fsl,ftm-timer";
> + 				reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
> + 				interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
> + 				clock-names = "ftm-evt", "ftm-src",
> + 					"ftm-evt-counter-en", "ftm-src-counter-en";
> + 				clocks = <&clks VF610_CLK_FTM2>,
> + 					<&clks VF610_CLK_FTM3>,
> + 					<&clks VF610_CLK_FTM2_EXT_FIX_EN>,
> + 					<&clks VF610_CLK_FTM3_EXT_FIX_EN>;
> + 				status = "disabled";
> + 			};
> +
>   			fec0: ethernet at 400d0000 {
>   				compatible = "fsl,mvf600-fec";
>   				reg = <0x400d0000 0x1000>;

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in
arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
node") from the clockevents tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/vf610.dtsi
index 73355ddc5186,3c91b84066a1..000000000000
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@@ -360,17 -347,19 +360,30 @@@
  				status = "disabled";
  			};
  
 +			esdhc1: esdhc@400b2000 {
 +				compatible = "fsl,imx53-esdhc";
 +				reg = <0x400b2000 0x4000>;
 +				interrupts = <0 28 0x04>;
 +				clocks = <&clks VF610_CLK_IPG_BUS>,
 +					<&clks VF610_CLK_PLATFORM_BUS>,
 +					<&clks VF610_CLK_ESDHC1>;
 +				clock-names = "ipg", "ahb", "per";
 +				status = "disabled";
 +			};
 +
+ 			ftm: ftm@400b8000 {
+ 				compatible = "fsl,ftm-timer";
+ 				reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
+ 				interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
+ 				clock-names = "ftm-evt", "ftm-src",
+ 					"ftm-evt-counter-en", "ftm-src-counter-en";
+ 				clocks = <&clks VF610_CLK_FTM2>,
+ 					<&clks VF610_CLK_FTM3>,
+ 					<&clks VF610_CLK_FTM2_EXT_FIX_EN>,
+ 					<&clks VF610_CLK_FTM3_EXT_FIX_EN>;
+ 				status = "disabled";
+ 			};
+ 
  			fec0: ethernet@400d0000 {
  				compatible = "fsl,mvf600-fec";
  				reg = <0x400d0000 0x1000>;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in
arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
node") from the clockevents tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/vf610.dtsi
index 73355ddc5186,3c91b84066a1..000000000000
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@@ -360,17 -347,19 +360,30 @@@
  				status = "disabled";
  			};
  
 +			esdhc1: esdhc@400b2000 {
 +				compatible = "fsl,imx53-esdhc";
 +				reg = <0x400b2000 0x4000>;
 +				interrupts = <0 28 0x04>;
 +				clocks = <&clks VF610_CLK_IPG_BUS>,
 +					<&clks VF610_CLK_PLATFORM_BUS>,
 +					<&clks VF610_CLK_ESDHC1>;
 +				clock-names = "ipg", "ahb", "per";
 +				status = "disabled";
 +			};
 +
+ 			ftm: ftm@400b8000 {
+ 				compatible = "fsl,ftm-timer";
+ 				reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
+ 				interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
+ 				clock-names = "ftm-evt", "ftm-src",
+ 					"ftm-evt-counter-en", "ftm-src-counter-en";
+ 				clocks = <&clks VF610_CLK_FTM2>,
+ 					<&clks VF610_CLK_FTM3>,
+ 					<&clks VF610_CLK_FTM2_EXT_FIX_EN>,
+ 					<&clks VF610_CLK_FTM3_EXT_FIX_EN>;
+ 				status = "disabled";
+ 			};
+ 
  			fec0: ethernet@400d0000 {
  				compatible = "fsl,mvf600-fec";
  				reg = <0x400d0000 0x1000>;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in
arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
node") from the clockevents tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/boot/dts/vf610.dtsi
index 73355ddc5186,3c91b84066a1..000000000000
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@@ -360,17 -347,19 +360,30 @@@
  				status = "disabled";
  			};
  
 +			esdhc1: esdhc at 400b2000 {
 +				compatible = "fsl,imx53-esdhc";
 +				reg = <0x400b2000 0x4000>;
 +				interrupts = <0 28 0x04>;
 +				clocks = <&clks VF610_CLK_IPG_BUS>,
 +					<&clks VF610_CLK_PLATFORM_BUS>,
 +					<&clks VF610_CLK_ESDHC1>;
 +				clock-names = "ipg", "ahb", "per";
 +				status = "disabled";
 +			};
 +
+ 			ftm: ftm at 400b8000 {
+ 				compatible = "fsl,ftm-timer";
+ 				reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
+ 				interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
+ 				clock-names = "ftm-evt", "ftm-src",
+ 					"ftm-evt-counter-en", "ftm-src-counter-en";
+ 				clocks = <&clks VF610_CLK_FTM2>,
+ 					<&clks VF610_CLK_FTM3>,
+ 					<&clks VF610_CLK_FTM2_EXT_FIX_EN>,
+ 					<&clks VF610_CLK_FTM3_EXT_FIX_EN>;
+ 				status = "disabled";
+ 			};
+ 
  			fec0: ethernet at 400d0000 {
  				compatible = "fsl,mvf600-fec";
  				reg = <0x400d0000 0x1000>;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140526/e2592070/attachment.sig>