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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241107165933.3e8b5af5@canb.auug.org.au>
Date: Thu, 7 Nov 2024 16:59:33 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Wim Van Sebroeck <wim@...ana.be>, Krzysztof Kozlowski <krzk@...nel.org>
Cc: Byoungtae Cho <bt.cho@...sung.com>, Guenter Roeck <linux@...ck-us.net>,
 Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>, Linux Kernel Mailing
 List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Sunyeal Hong <sunyeal.hong@...sung.com>,
 Taewan Kim <trunixs.kim@...sung.com>, Wim Van Sebroeck
 <wim@...ux-watchdog.org>
Subject: linux-next: manual merge of the watchdog tree with the samsung-krzk
 tree

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@...20000 {
 +			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@...60000 {
+ 			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@...70000 {
+ 			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@...00000 {
  			compatible = "arm,gic-v3";
  			#interrupt-cells = <3>;

Content of type "application/pgp-signature" skipped