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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 Dec 2023 10:08:48 +1100

Hi all,

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

  arch/arm/boot/dts/qcom/qcom-msm8974.dtsi

between commit:

  4960e06d386e ("ARM: dts: qcom: msm8974: sort nodes by reg")

from the arm-soc tree and commit:

  95053f6bc8ff ("ARM: dts: qcom: msm8974: Add watchdog node")

from the qcom 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/qcom/qcom-msm8974.dtsi
index 76006c3c4af2,f7d7e5d70f30..000000000000
--- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@@ -346,12 -346,14 +346,20 @@@
  			reg = <0xf9011000 0x1000>;
  		};
  
 +		saw_l2: power-controller@f9012000 {
 +			compatible = "qcom,saw2";
 +			reg = <0xf9012000 0x1000>;
 +			regulator;
 +		};
 +
+ 		watchdog@f9017000 {
+ 			compatible = "qcom,apss-wdt-msm8974", "qcom,kpss-wdt";
+ 			reg = <0xf9017000 0x1000>;
+ 			interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>,
+ 				     <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&sleep_clk>;
+ 		};
+ 
  		timer@f9020000 {
  			#address-cells = <1>;
  			#size-cells = <1>;