From nobody Mon Dec 29 00:44:47 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1F10C10DC3 for ; Sun, 3 Dec 2023 23:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230122AbjLCXIv (ORCPT ); Sun, 3 Dec 2023 18:08:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjLCXIu (ORCPT ); Sun, 3 Dec 2023 18:08:50 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED939D3; Sun, 3 Dec 2023 15:08:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701644930; bh=+cPhwPJpcFNZb6c+xA04ocJR/AeqowdM77bWLN+NPh8=; h=Date:From:To:Cc:Subject:From; b=Jqg5t6YzxoqQY6tdAy4DysDZoN4FMgwjDCla6ifOr5TpuRqnTveN4yhtbihldr3Vu jdQh4qJw99MbrnwcjLOSA4GHlXWvbrZRuRcp+pFCFTUXSrbwaJuVykQ7pNMEIOkw9M kCaHBVhZO39xEaDWkLyy3rqUm7g74RiDadJH9gwFNU2vy2QaUE5SQadll3uFHErcVy tTGFSx4qlPnXDLZOQBfGZihs5wnOfzmD0/68KDMj4LUc7ROGMwxpyTOVxBbXNLaTtW lqbmHUV9oj2oYgE1kz9njSujvkRqQx2IBfy1xVrduC4PSlEeqfvyx+EwwsEn0R/xCx tEHPwWMeS+3GA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Sk2Xx5HRgz4wdF; Mon, 4 Dec 2023 10:08:49 +1100 (AEDT) Date: Mon, 4 Dec 2023 10:08:48 +1100 From: Stephen Rothwell To: Andy Gross , Olof Johansson , Arnd Bergmann Cc: ARM , Bjorn Andersson , Linux Kernel Mailing List , Linux Next Mailing List , Luca Weiss , Matti =?UTF-8?B?TGVodGltw6RraQ==?= 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Mr99CGmXgA.EJQSAJWq/VDg Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 , + ; + 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--