linux-next: manual merge of the watchdog tree with the samsung-krzk tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  arch/arm64/boot/dts/exynos/exynosautov920.dtsi

between commit:

  ef1c2a54cbc7 ("arm64: dts: exynosautov920: add peric1, misc and hsi0/1 clock DT nodes")

from the samsung-krzk tree and commit:

  3595a523d043 ("arm64: dts: exynosautov920: add watchdog DT node")

from the watchdog 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/arm64/boot/dts/exynos/exynosautov920.dtsi
index c759134c909e,2b3e8debda3d..000000000000
--- a/arch/arm64/boot/dts/exynos/exynosautov920.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynosautov920.dtsi
@@@ -172,17 -172,26 +172,37 @@@
  			reg = <0x10000000 0x24>;
  		};
  
 +		cmu_misc: clock-controller@10020000 {
 +			compatible = "samsung,exynosautov920-cmu-misc";
 +			reg = <0x10020000 0x8000>;
 +			#clock-cells = <1>;
 +
 +			clocks = <&xtcxo>,
 +				 <&cmu_top DOUT_CLKCMU_MISC_NOC>;
 +			clock-names = "oscclk",
 +				      "noc";
 +		};
 +
+ 		watchdog_cl0: watchdog@10060000 {
+ 			compatible = "samsung,exynosautov920-wdt";
+ 			reg = <0x10060000 0x100>;
+ 			interrupts = <GIC_SPI 953 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&xtcxo>, <&xtcxo>;
+ 			clock-names = "watchdog", "watchdog_src";
+ 			samsung,syscon-phandle = <&pmu_system_controller>;
+ 			samsung,cluster-index = <0>;
+ 		};
+ 
+ 		watchdog_cl1: watchdog@10070000 {
+ 			compatible = "samsung,exynosautov920-wdt";
+ 			reg = <0x10070000 0x100>;
+ 			interrupts = <GIC_SPI 952 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&xtcxo>, <&xtcxo>;
+ 			clock-names = "watchdog", "watchdog_src";
+ 			samsung,syscon-phandle = <&pmu_system_controller>;
+ 			samsung,cluster-index = <1>;
+ 		};
+ 
  		gic: interrupt-controller@10400000 {
  			compatible = "arm,gic-v3";
  			#interrupt-cells = <3>;

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