lkml.org 
[lkml]   [2021]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the devicetree tree with the iommu tree
On Thu, Oct 28, 2021 at 9:19 PM Stephen Rothwell <sfr@canb.auug.org.au> 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

\
 
 \ /
  Last update: 2021-10-29 15:47    [W:0.032 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site