Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 29 Oct 2021 13:18:54 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Rob Herring <robherring2@gmail.com>, Joerg Roedel <joro@8bytes.org>
Cc:     David Heidelberg <david@ixit.cz>,
        Konrad Dybcio <konrad.dybcio@somainline.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Rob Herring <robh@kernel.org>, Will Deacon <will@kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the iommu tree
Message-ID: <20211029131854.042d8202@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/W+QxdtipLWTbYA511L5V.Uc";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/W+QxdtipLWTbYA511L5V.Uc
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/devicetree/bindings/iommu/arm,smmu.yaml

between commit:

  e4a40f15b031 ("dt-bindings: arm-smmu: Add compatible for SM6350 SoC")

from the iommu tree and commit:

  e6b331271d41 ("dt-bindings: arm-smmu: Add compatible for the SDX55 SoC")

from the devicetree 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/iommu/arm,smmu.yaml
index f66a3effba73,5ccf0025ffa9..000000000000
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
@@@ -38,7 -37,7 +38,8 @@@ properties
                - qcom,sc7280-smmu-500
                - qcom,sc8180x-smmu-500
                - qcom,sdm845-smmu-500
+               - qcom,sdx55-smmu-500
 +              - qcom,sm6350-smmu-500
                - qcom,sm8150-smmu-500
                - qcom,sm8250-smmu-500
                - qcom,sm8350-smmu-500

--Sig_/W+QxdtipLWTbYA511L5V.Uc
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmF7Wg4ACgkQAVBC80lX
0GxjBgf/S2LR+nuWdqyXNjvcl2ZR4xOYt7yqLRNonlInBWAywWOIN9/y4CSJSVKY
1Gq/XQSznQUlQOo1+Fac40IbQdq36V36Xs6P2kDDwbWZb9xQzgLx9xf4ErTz8QlS
KVazOligx7oztTLp5ETSq5+BjfyeTsRY/b82TpTtQnVDy4/CC3QZXVKtFtlYcsnN
oa+hwxKhnDHfSY8Ta62VtOEBUD4cgO2ky5ZubODgDi4oWDRCUZPzpVxGv8uAe4Un
Uvk7fea+tF9FwoBuQ/M0H2XwOdVTUXgHcfkZXBvrzrjuWU31CdAcQHkRy5UBIPyF
yhHgxLcmS1T/msNWK1t89YYueFDhiQ==
=Cg+8
-----END PGP SIGNATURE-----

--Sig_/W+QxdtipLWTbYA511L5V.Uc--