linux-kernel - linux-next: manual merge of the devicetree tree with the iommu tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211029131854.042d8202@canb.auug.org.au>
Date:   Fri, 29 Oct 2021 13:18:54 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>, Joerg Roedel <joro@...tes.org>
Cc:     David Heidelberg <david@...t.cz>,
        Konrad Dybcio <konrad.dybcio@...ainline.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Herring <robh@...nel.org>, Will Deacon <will@...nel.org>
Subject: linux-next: manual merge of the devicetree tree with the iommu tree

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.

-- 
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

Content of type "application/pgp-signature" skipped