On Thu, Oct 28, 2021 at 9:19 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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