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
On Thu, Oct 28, 2021 at 9:19 PM Stephen Rothwell <[email protected]> wrote:
>
> 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've dropped it from my tree. Will can pick it up instead.
Rob