Re: linux-next: manual merge of the clockevents tree with the arm-soc tree
On Mon, Aug 1, 2016 at 9:26 PM, Linus Torvalds 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
On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell 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
Hi all,
On Wed, 27 Jul 2016 08:08:45 +1000 Stephen Rothwell
wrote:
>
> 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
>
> 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
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
--
Cheers,
Stephen Rothwell
Re: linux-next: manual merge of the clockevents tree with the arm-soc tree
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
Re: linux-next: manual merge of the clockevents tree with the arm-soc tree
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
--
Facebook |
Twitter |
Re: linux-next: manual merge of the clockevents tree with the arm-soc tree
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 same
patches) :-(
--
Cheers,
Stephen Rothwell
Re: linux-next: manual merge of the clockevents tree with the arm-soc tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the clockevents tree with the arm-soc tree
> 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
Thanks,
BRs
Xiubo
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc arch/arm/boot/dts/vf610.dtsi
> index 73355ddc5186,3c91b84066a1..
> --- 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@400d {
> compatible = "fsl,mvf600-fec";
> reg = <0x400d 0x1000>;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
