Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Date:   Mon, 23 May 2022 14:05:25 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jassi Brar <jaswinder.singh@linaro.org>,
        Rob Herring <robherring2@gmail.com>
Cc:     David Heidelberg <david@ixit.cz>,
        Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the mailbox tree with the devicetree
 tree
Message-ID: <20220523140525.4ad591d0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/=rAw.59tZ1cA61PxWG775Ar";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/=rAw.59tZ1cA61PxWG775Ar
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml

between commit:

  b20eee62ee89 ("dt-bindings: mailbox: qcom-ipcc: add missing properties in=
to example")

from the devicetree tree and commit:

  cd285535b8ee ("dt-bindings: mailbox: qcom-ipcc: simplify the example")

from the mailbox 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 Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
index 50f9aa72c670,dfdc72345a2a..000000000000
--- a/Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
+++ b/Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
@@@ -62,28 -61,14 +62,28 @@@ additionalProperties: fals
 =20
  examples:
    - |
-         #include <dt-bindings/interrupt-controller/arm-gic.h>
-         #include <dt-bindings/mailbox/qcom-ipcc.h>
+     #include <dt-bindings/interrupt-controller/arm-gic.h>
+     #include <dt-bindings/mailbox/qcom-ipcc.h>
 =20
-         mailbox@408000 {
-                 compatible =3D "qcom,sm8250-ipcc", "qcom,ipcc";
-                 reg =3D <0x408000 0x1000>;
-                 interrupts =3D <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
-                 interrupt-controller;
-                 #interrupt-cells =3D <3>;
-                 #mbox-cells =3D <2>;
-         };
+     mailbox@408000 {
+         compatible =3D "qcom,sm8250-ipcc", "qcom,ipcc";
+         reg =3D <0x408000 0x1000>;
+         interrupts =3D <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
+         interrupt-controller;
+         #interrupt-cells =3D <3>;
+         #mbox-cells =3D <2>;
+     };
 +
-         smp2p-modem {
-                 compatible =3D "qcom,smp2p";
-                 qcom,smem =3D <443>, <429>;
-                 interrupts-extended =3D <&ipcc IPCC_CLIENT_LPASS
-                                              IPCC_MPROC_SIGNAL_SMP2P
-                                              IRQ_TYPE_EDGE_RISING>;
-                 mboxes =3D <&ipcc IPCC_CLIENT_LPASS
-                                 IPCC_MPROC_SIGNAL_SMP2P>;
++    smp2p-modem {
++        compatible =3D "qcom,smp2p";
++        qcom,smem =3D <443>, <429>;
++        interrupts-extended =3D <&ipcc IPCC_CLIENT_LPASS
++                                     IPCC_MPROC_SIGNAL_SMP2P
++                                     IRQ_TYPE_EDGE_RISING>;
++        mboxes =3D <&ipcc IPCC_CLIENT_LPASS
++                        IPCC_MPROC_SIGNAL_SMP2P>;
 +
-                 qcom,local-pid =3D <0>;
-                 qcom,remote-pid =3D <2>;
-                 /* Other SMP2P fields */
-         };
++        qcom,local-pid =3D <0>;
++        qcom,remote-pid =3D <2>;
++        /* Other SMP2P fields */
++    };

--Sig_/=rAw.59tZ1cA61PxWG775Ar
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKLCAUACgkQAVBC80lX
0Gwojgf/cR82xL5ati0hnrmEAMdVEmCro6867KtJMJGl2PLJLd0Dbu3ddup8w1oI
X45Ygca6jXzz2w5BYFO7IfkKVrYHa4nT2zy6vq7uZDUD/CczkoPCzsw3q6uU6bYO
hrkIPjVsmHLliXV34JresvCKKZ1AoSjxOxO6PT1gDAJ4zwWcgEQFw3Q1juqmi1Q3
/B2AClq38vYDdPSCPgezTqwNhAc3D9lwkbUqn8HzlVjzEtuD/dVg5P/bWpkFo5L7
eTKnxVt6KqwyrLgd2TPzEtq+RUxY2T6ik5N5MGT0p9snJbPNKMgISnflXcbf1yGy
wluyUqDDQ6BhzO7sqx87VDHGkswsxg==
=J6Cr
-----END PGP SIGNATURE-----

--Sig_/=rAw.59tZ1cA61PxWG775Ar--