Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1450943 > unrolled thread

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

Started byStephen Rothwell <sfr@canb.auug.org.au>
First post2016-07-27 00:10 +0200
Last post2016-08-02 03:40 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: linux-next: manual merge of the clockevents tree with the  arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-27 00:10 +0200
    Re: linux-next: manual merge of the clockevents tree with the  arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-08-02 01:30 +0200
      Re: linux-next: manual merge of the clockevents tree with the arm-soc tree Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-02 03:30 +0200
        Re: linux-next: manual merge of the clockevents tree with the arm-soc tree Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-02 03:40 +0200

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

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2016-07-27 00:10 +0200
SubjectRe: linux-next: manual merge of the clockevents tree with the arm-soc tree
Message-ID<rZiI1-7He-3@gated-at.bofh.it>
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

[toc] | [next] | [standalone]

#1453506

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2016-08-02 01:30 +0200
Message-ID<s1uOK-4Jb-13@gated-at.bofh.it>
In reply to#1450943
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

[toc] | [prev] | [next] | [standalone]

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

FromLinus Torvalds <torvalds@linux-foundation.org>
Date2016-08-02 03:30 +0200
SubjectRe: linux-next: manual merge of the clockevents tree with the arm-soc tree
Message-ID<s1wGW-5Vm-13@gated-at.bofh.it>
In reply to#1453506
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

[toc] | [prev] | [next] | [standalone]

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

FromLinus Torvalds <torvalds@linux-foundation.org>
Date2016-08-02 03:40 +0200
SubjectRe: linux-next: manual merge of the clockevents tree with the arm-soc tree
Message-ID<s1wQx-5YM-1@gated-at.bofh.it>
In reply to#1453528
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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web