Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Date:   Mon, 4 Dec 2023 10:08:48 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andy Gross <agross@kernel.org>, Olof Johansson <olof@lixom.net>,
        Arnd Bergmann <arnd@arndb.de>
Cc:     ARM <linux-arm-kernel@lists.infradead.org>,
        Bjorn Andersson <andersson@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Luca Weiss <luca@z3ntu.xyz>,
        Matti =?UTF-8?B?TGVodGltw6RraQ==?= <matti.lehtimaki@gmail.com>
Subject: linux-next: manual merge of the qcom tree with the arm-soc tree
Message-ID: <20231204100848.141cfd29@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Mr99CGmXgA.EJQSAJWq/VDg";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Mr99CGmXgA.EJQSAJWq/VDg
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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 =3D <0xf9011000 0x1000>;
  		};
 =20
 +		saw_l2: power-controller@f9012000 {
 +			compatible =3D "qcom,saw2";
 +			reg =3D <0xf9012000 0x1000>;
 +			regulator;
 +		};
 +
+ 		watchdog@f9017000 {
+ 			compatible =3D "qcom,apss-wdt-msm8974", "qcom,kpss-wdt";
+ 			reg =3D <0xf9017000 0x1000>;
+ 			interrupts =3D <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>,
+ 				     <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
+ 			clocks =3D <&sleep_clk>;
+ 		};
+=20
  		timer@f9020000 {
  			#address-cells =3D <1>;
  			#size-cells =3D <1>;

--Sig_/Mr99CGmXgA.EJQSAJWq/VDg
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVtCoEACgkQAVBC80lX
0GxynAf/a9gewMQ9Sp49Ya67OJ9B3BBWzmhgWXcKOGTHa5cUzF2/0Bakg19+Qqh1
BhtWsO0iRe+hAMVkeNYC+S3wUTqpJ7BsguUkblqCLYAnJDQqEuRFjDJnH3slqfVB
dlpqzS5SPTN7hvRQzYstcU1WlsXeHO/hIoAThFCsJwkTLTmFV6M7RKc8iDue74Mp
MFStQJ5qvqwpg5Tt7OUxZe8mcoTBQuDMbmeXCcK+QMwBmv+SPN/rWdtqz8YxcpKZ
n9stTNAy93cKfJE3JNo2mvZRdrL/YXxHwjAYhXsejxVGH+SwZJ+wDfomB0QZhyel
WEL92f4eqndvXuo72GJBmA/8sZdqAA==
=6Sdq
-----END PGP SIGNATURE-----

--Sig_/Mr99CGmXgA.EJQSAJWq/VDg--