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

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

[Stephen Rothwell]

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

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
build dtb if associated Arch and/or SoC is enabled") from the arm-soc
tree and commits 9ccba8abd0a7 ("ARM: shmobile: kzm9g: Build DTS for
Multiplatform") and 93c9f0228a3d ("ARM: shmobile: kzm9g-reference:
Remove board C code and DT file") from the renesas 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/Makefile
index 95fed8145ac9,be6e2607da88..000000000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -466,10 -411,8 +466,9 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += 
  	r8a7778-bockw-reference.dtb \
  	r8a7779-marzen.dtb \
  	sh7372-mackerel.dtb \
- 	sh73a0-kzm9g.dtb \
- 	sh73a0-kzm9g-reference.dtb
+ 	sh73a0-kzm9g.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
 +dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
 +	emev2-kzm9d.dtb \
  	r7s72100-genmai.dtb \
  	r8a73a4-ape6evm.dtb \
  	r8a7740-armadillo800eva.dtb \
@@@ -477,9 -420,9 +476,10 @@@
  	r8a7790-lager.dtb \
  	r8a7791-henninger.dtb \
  	r8a7791-koelsch.dtb \
- 	r8a7794-alt.dtb
+ 	r8a7794-alt.dtb \
+ 	sh73a0-kzm9g.dtb
 -dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
 +dtb-$(CONFIG_ARCH_SOCFPGA) += \
 +	socfpga_arria5_socdk.dtb \
  	socfpga_arria10_socdk.dtb \
  	socfpga_cyclone5_socdk.dtb \
  	socfpga_cyclone5_sockit.dtb \

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Geert Uytterhoeven]

On Thu, Jan 15, 2015 at 1:38 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the renesas tree got a conflict in
> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
> build dtb if associated Arch and/or SoC is enabled") from the arm-soc
> tree and commits 9ccba8abd0a7 ("ARM: shmobile: kzm9g: Build DTS for
> Multiplatform") and 93c9f0228a3d ("ARM: shmobile: kzm9g-reference:
> Remove board C code and DT file") from the renesas tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Your resolution is correct.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

[Stephen Rothwell]

Hi Simon,

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

  arch/arm64/configs/defconfig

between commit:

  efdda175c07f ("arm64: defconfig: add spmi and usb related configs")

from the arm-soc tree and commit:

  a9c42f02387c ("arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support")

from the renesas tree.

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

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/configs/defconfig
index 7fddb2188f5c,eaf738a59927..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -230,7 -213,7 +230,8 @@@ CONFIG_QCOM_SMD_RPM=
  CONFIG_ARCH_TEGRA_132_SOC=y
  CONFIG_ARCH_TEGRA_210_SOC=y
  CONFIG_HISILICON_IRQ_MBIGEN=y
 +CONFIG_EXTCON_USB_GPIO=y
+ CONFIG_PHY_RCAR_GEN3_USB2=y
  CONFIG_PHY_XGENE=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y

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

[Arnd Bergmann]

On Wednesday 02 December 2015 11:21:09 Mark Brown wrote:
> 
> Today's linux-next merge of the renesas tree got a conflict in
> arch/arm/mach-shmobile/Kconfig between commit e32465429490 ("ARM: use "depends
> on" for SoC configs instead of "if" after prompt") from the arm-soc tree and
> commit 9b5ba0df4ea4f94 ("ARM: shmobile: Introduce ARCH_RENESAS") from the
> renesas tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

(as predicted by Simon ;-) )

I plan to put the cross-platform changes I have in next/cleanup into a separate
branch that can be pulled into other branches to resolve those issues.

	Arnd

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

[Mark Brown]

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

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/Kconfig between commit e32465429490 ("ARM: use "depends
on" for SoC configs instead of "if" after prompt") from the arm-soc tree and
commit 9b5ba0df4ea4f94 ("ARM: shmobile: Introduce ARCH_RENESAS") from the
renesas tree.

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

diff --cc arch/arm/mach-shmobile/Kconfig
index 0f25f8fa2692,4ed72b124235..000000000000
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -29,10 -31,11 +31,11 @@@ config ARCH_RMOBIL
        select SYS_SUPPORTS_SH_CMT
        select SYS_SUPPORTS_SH_TMU
  
- menuconfig ARCH_SHMOBILE_MULTI
+ menuconfig ARCH_RENESAS
 -      bool "Renesas ARM SoCs" if ARCH_MULTI_V7
 -      depends on MMU
 +      bool "Renesas ARM SoCs"
 +      depends on ARCH_MULTI_V7 && MMU
        select ARCH_SHMOBILE
+       select ARCH_SHMOBILE_MULTI
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select ARM_GIC

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

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

[Stephen Rothwell]

Hi Simon,

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

  arch/arm/mach-shmobile/board-marzen-reference.c and
  arch/arm/mach-shmobile/board-marzen.c

between commit:

  3017a8804ada ("ARM: appropriate __init annotation for const data")

from the arm-soc tree and commits:

  d2fb6bdaffc7 ("ARM: shmobile: marzen-reference: Remove C board code")
  9d35777f2b96 ("ARM: shmobile: marzen: Remove legacy board code")

from the renesas tree.

I fixed it up (I just removed the 2 files) and can carry the fix as
necessary (no action is required).

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

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

[Stephen Rothwell]

Hi Simon,

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

  arch/arm/mach-shmobile/setup-r8a7779.c

between commit:

  3017a8804ada ("ARM: appropriate __init annotation for const data")

from the arm-soc tree and commit:

  131c2e0480b0 ("ARM: shmobile: r8a7779: Generic CCF and timer suppor")

from the renesas 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/mach-shmobile/setup-r8a7779.c
index 2321c9de2274,c18d85a96c67..000000000000
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@@ -756,7 -96,13 +96,13 @@@ static u32 __init r8a7779_read_mode_pin
  	return mode;
  }
  
+ static void __init r8a7779_init_time(void)
+ {
+ 	r8a7779_clocks_init(r8a7779_read_mode_pins());
+ 	clocksource_of_init();
+ }
+ 
 -static const char *r8a7779_compat_dt[] __initdata = {
 +static const char *r8a7779_compat_dt[] __initconst = {
  	"renesas,r8a7779",
  	NULL,
  };

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

[Stephen Rothwell]

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

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/boot/dts/r8a7790-lager.dts between commit 637193b2f22c ("Merge
branch 'next/boards' into for-next") from the arm-soc tree and commit
2a3bd7497db1 ("Merge branch 'heads/dt-scif-for-v3.16' into next") from
the renesas tree.

I fixed it up (I used the latter since it kept the trailing semi-colon)
and can carry the fix as necessary (no action is required).

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

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

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

[Mike Turquette]

Quoting Nicolas Ferre (2014-01-06 01:44:27)
> On 04/01/2014 06:11, Olof Johansson :
> > On Mon, Dec 16, 2013 at 2:00 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> >> On 16/12/2013 00:47, Stephen Rothwell :
> >>> Hi Simon,
> >>>
> >>> Today's linux-next merge of the renesas tree got a conflict in
> >>> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> >>> base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
> >>> shmobile: Add R-Car Gen2 clocks support") from the renesas tree.
> >>>
> >>> I fixed it up (see below) and can carry the fix as necessary (no action
> >>> is required).
> >>
> >> Fine for me.
> > 
> > Simon, Nicolas,
> > 
> > <mini-rant>
> > 
> > While a very minor issue, this should have been altogether avoided
> > with a little more attention when applying patches. The Makefile is
> > sorted, and you've appended new lines to the end instead of in the
> > place they're supposed to go. Sure, others have done the same mistake
> > in a few places but that doesn't mean we shouldn't try to keep it
> > sorted.
> > 
> > The very reason _to_ sort a Makefile is to avoid these needless
> > add-add conflicts when two people append to the same unsorted list.
> > 
> > Now I can't resolve it properly and move the entries when I do the
> > same merge (and get the same conflict), because that will cause a
> > third conflict for Stephen, and he's about to return from vacation and
> > is going to cuss at us if we cause too many new conflicts in one day.
> > :)
> > 
> > </mini-rant>
> > 
> > So, best choice is to keep the unsortedness now, and have Mike resort
> > his Makefile for us at the end of the merge window. And keep a little
> > closer eye on Makefile and Kconfig additions in the future. :)
> 
> Totally agree in keeping a Makefile sorted, when it is already sorted.
> What I recall having thought when I had seen this Makefile is: well this
> one must be of the "append your changes to the end" type...
> 
> Anyway be sure that I will pay attention to this.

The file used to be sorted. I've cleaned it up locally and will apply
the patch after I take in a few more pull requests.

Regards,
Mike

> 
> Bye,
> -- 
> Nicolas Ferre

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

[Nicolas Ferre]

On 04/01/2014 06:11, Olof Johansson :
> On Mon, Dec 16, 2013 at 2:00 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
>> On 16/12/2013 00:47, Stephen Rothwell :
>>> Hi Simon,
>>>
>>> Today's linux-next merge of the renesas tree got a conflict in
>>> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
>>> base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
>>> shmobile: Add R-Car Gen2 clocks support") from the renesas tree.
>>>
>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>> is required).
>>
>> Fine for me.
> 
> Simon, Nicolas,
> 
> <mini-rant>
> 
> While a very minor issue, this should have been altogether avoided
> with a little more attention when applying patches. The Makefile is
> sorted, and you've appended new lines to the end instead of in the
> place they're supposed to go. Sure, others have done the same mistake
> in a few places but that doesn't mean we shouldn't try to keep it
> sorted.
> 
> The very reason _to_ sort a Makefile is to avoid these needless
> add-add conflicts when two people append to the same unsorted list.
> 
> Now I can't resolve it properly and move the entries when I do the
> same merge (and get the same conflict), because that will cause a
> third conflict for Stephen, and he's about to return from vacation and
> is going to cuss at us if we cause too many new conflicts in one day.
> :)
> 
> </mini-rant>
> 
> So, best choice is to keep the unsortedness now, and have Mike resort
> his Makefile for us at the end of the merge window. And keep a little
> closer eye on Makefile and Kconfig additions in the future. :)

Totally agree in keeping a Makefile sorted, when it is already sorted.
What I recall having thought when I had seen this Makefile is: well this
one must be of the "append your changes to the end" type...

Anyway be sure that I will pay attention to this.

Bye,
-- 
Nicolas Ferre

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

[Simon Horman]

On Sat, Jan 04, 2014 at 10:43:46PM +1100, Stephen Rothwell wrote:
> Hi Olof,
> 
> On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson <olof@lixom.net> wrote:
> >
> > Now I can't resolve it properly and move the entries when I do the
> > same merge (and get the same conflict), because that will cause a
> > third conflict for Stephen, and he's about to return from vacation and
> > is going to cuss at us if we cause too many new conflicts in one day.
> > :)
> 
> Since I have now been made aware of the issue, you might as well just
> sort it in the merge.  And I have never been known to "cuss", though
> ranting is a possibility :-)


Rant accepted. I will be more careful in future.

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

[Stephen Rothwell]

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

Hi Olof,

On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson <olof@lixom.net> wrote:
>
> Now I can't resolve it properly and move the entries when I do the
> same merge (and get the same conflict), because that will cause a
> third conflict for Stephen, and he's about to return from vacation and
> is going to cuss at us if we cause too many new conflicts in one day.
> :)

Since I have now been made aware of the issue, you might as well just
sort it in the merge.  And I have never been known to "cuss", though
ranting is a possibility :-)

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

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

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

[Olof Johansson]

On Mon, Dec 16, 2013 at 2:00 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> On 16/12/2013 00:47, Stephen Rothwell :
>> Hi Simon,
>>
>> Today's linux-next merge of the renesas tree got a conflict in
>> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
>> base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
>> shmobile: Add R-Car Gen2 clocks support") from the renesas tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Fine for me.

Simon, Nicolas,

<mini-rant>

While a very minor issue, this should have been altogether avoided
with a little more attention when applying patches. The Makefile is
sorted, and you've appended new lines to the end instead of in the
place they're supposed to go. Sure, others have done the same mistake
in a few places but that doesn't mean we shouldn't try to keep it
sorted.

The very reason _to_ sort a Makefile is to avoid these needless
add-add conflicts when two people append to the same unsorted list.

Now I can't resolve it properly and move the entries when I do the
same merge (and get the same conflict), because that will cause a
third conflict for Stephen, and he's about to return from vacation and
is going to cuss at us if we cause too many new conflicts in one day.
:)

</mini-rant>

So, best choice is to keep the unsortedness now, and have Mike resort
his Makefile for us at the end of the merge window. And keep a little
closer eye on Makefile and Kconfig additions in the future. :)


-Olof

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

[Simon Horman]

On Mon, Dec 16, 2013 at 11:00:54AM +0100, Nicolas Ferre wrote:
> On 16/12/2013 00:47, Stephen Rothwell :
> > Hi Simon,
> > 
> > Today's linux-next merge of the renesas tree got a conflict in
> > drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> > base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
> > shmobile: Add R-Car Gen2 clocks support") from the renesas tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Fine for me.

Likewise. Thanks Stephen.

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

[Nicolas Ferre]

On 16/12/2013 00:47, Stephen Rothwell :
> Hi Simon,
> 
> Today's linux-next merge of the renesas tree got a conflict in
> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
> shmobile: Add R-Car Gen2 clocks support") from the renesas tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fine for me.

Thanks. Bye,
-- 
Nicolas Ferre

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

[Stephen Rothwell]

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

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
shmobile: Add R-Car Gen2 clocks support") from the renesas 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 drivers/clk/Makefile
index ace7309c4369,8dd1339be98b..000000000000
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -35,7 -35,7 +35,8 @@@ obj-$(CONFIG_ARCH_TEGRA)	+= tegra
  obj-$(CONFIG_PLAT_SAMSUNG)	+= samsung/
  obj-$(CONFIG_COMMON_CLK_XGENE)  += clk-xgene.o
  obj-$(CONFIG_COMMON_CLK_KEYSTONE)	+= keystone/
 +obj-$(CONFIG_COMMON_CLK_AT91)	+= at91/
+ obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= shmobile/
  
  obj-$(CONFIG_X86)		+= x86/
  

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

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

[Stephen Rothwell]

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

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/setup-r8a7740.c between commit 0583fe478a7d ("ARM:
convert arm/arm64 arch timer to use CLKSRC_OF init") from the arm-soc
tree and commit 74d6523995cc ("ARM: shmobile: r8a7740: Prepare for
reference DT setup") from the renesas 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/mach-shmobile/setup-r8a7740.c
index 326a4ab,00c5a70..0000000
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@@ -1027,9 -1016,10 +1016,9 @@@ static const char *r8a7740_boards_compa
  
  DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
  	.map_io		= r8a7740_map_io,
- 	.init_early	= r8a7740_add_early_devices_dt,
- 	.init_irq	= r8a7740_init_irq,
- 	.init_machine	= r8a7740_add_standard_devices_dt,
+ 	.init_early	= r8a7740_init_delay,
+ 	.init_irq	= r8a7740_init_irq_of,
+ 	.init_machine	= r8a7740_generic_init,
 -	.init_time	= shmobile_timer_init,
  	.dt_compat	= r8a7740_boards_compat_dt,
  MACHINE_END
  

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