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

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

[Stephen Rothwell]

Hi all,

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

  arch/arm/boot/dts/r7s72100.dtsi

between commit:

  f08578e6da96 ("ARM: 8661/1: dts: r7s72100: add l2 cache")

from the arm tree and commit:

  69ed50de582e ("ARM: dts: r7s72100: Add watchdog timer")

from the renesas 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/r7s72100.dtsi
index 1cf2bd038090,9b12d73e67dc..000000000000
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@@ -369,16 -371,13 +372,23 @@@
  			<0xe8202000 0x1000>;
  	};
  
 +	L2: cache-controller@3ffff000 {
 +		compatible = "arm,pl310-cache";
 +		reg = <0x3ffff000 0x1000>;
 +		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
 +		arm,early-bresp-disable;
 +		arm,full-line-zero-disable;
 +		cache-unified;
 +		cache-level = <2>;
 +	};
 +
+ 	wdt: watchdog@fcfe0000 {
+ 		compatible = "renesas,r7s72100-wdt", "renesas,rza-wdt";
+ 		reg = <0xfcfe0000 0x6>;
+ 		interrupts = <GIC_SPI 106 IRQ_TYPE_EDGE_RISING>;
+ 		clocks = <&p0_clk>;
+ 	};
+ 
  	i2c0: i2c@fcfee000 {
  		#address-cells = <1>;
  		#size-cells = <0>;

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

[Simon Horman]

On Mon, Mar 20, 2017 at 10:04:11AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the renesas tree got a conflict in:
> 
>   arch/arm/boot/dts/r7s72100.dtsi
> 
> between commit:
> 
>   f08578e6da96 ("ARM: 8661/1: dts: r7s72100: add l2 cache")
> 
> from the arm tree and commit:
> 
>   69ed50de582e ("ARM: dts: r7s72100: Add watchdog timer")
> 
> from the renesas 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.

Thanks Stephen,

this looks correct to me.

> diff --cc arch/arm/boot/dts/r7s72100.dtsi
> index 1cf2bd038090,9b12d73e67dc..000000000000
> --- a/arch/arm/boot/dts/r7s72100.dtsi
> +++ b/arch/arm/boot/dts/r7s72100.dtsi
> @@@ -369,16 -371,13 +372,23 @@@
>   			<0xe8202000 0x1000>;
>   	};
>   
>  +	L2: cache-controller@3ffff000 {
>  +		compatible = "arm,pl310-cache";
>  +		reg = <0x3ffff000 0x1000>;
>  +		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
>  +		arm,early-bresp-disable;
>  +		arm,full-line-zero-disable;
>  +		cache-unified;
>  +		cache-level = <2>;
>  +	};
>  +
> + 	wdt: watchdog@fcfe0000 {
> + 		compatible = "renesas,r7s72100-wdt", "renesas,rza-wdt";
> + 		reg = <0xfcfe0000 0x6>;
> + 		interrupts = <GIC_SPI 106 IRQ_TYPE_EDGE_RISING>;
> + 		clocks = <&p0_clk>;
> + 	};
> + 
>   	i2c0: i2c@fcfee000 {
>   		#address-cells = <1>;
>   		#size-cells = <0>;
> 

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

[Stephen Rothwell]

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

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/headsmp.S between commit 8a3a9dd50dd9 ("ARM:
convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree
and commit 8b438bcb9009 ("ARM: shmobile: Allow use of boot code for
non-SMP case") 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/headsmp.S
index 293007579b8e,faf82144a262..000000000000
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@@ -10,11 -10,12 +10,13 @@@
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
   */
- #include <linux/linkage.h>
  #include <linux/init.h>
+ #include <linux/linkage.h>
+ #include <linux/threads.h>
 +#include <asm/assembler.h>
  #include <asm/memory.h>
  
+ #ifdef CONFIG_SMP
  ENTRY(shmobile_invalidate_start)
  	bl	v7_invalidate_l1
  	b	secondary_startup

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

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

[Stephen Rothwell]

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

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/Kconfig between commit fb521a0da155 ("arm: fix up
ARM_ARCH_TIMER selects") from the arm tree and commits 462972da5f18
("ARM: shmobile: Make r8a7790 Arch timer optional") and 39d97587d6cb
("ARM: shmobile: Make r8a73a4 Arch timer optional") from the renesas tree.

I fixed it up (the latter patches removed the "select"s that the former
modified) and can carry the fix as necessary (no action is required).

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

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