linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <CAL_JsqLqhZAOJxMcdtxe1bAFpYxG6pjRPSK7fVukUMNp2ucCvA@mail.gmail.com>
Date:   Fri, 29 Oct 2021 08:46:38 -0500
From:   Rob Herring <robherring2@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Will Deacon <will@...nel.org>
Cc:     Joerg Roedel <joro@...tes.org>, 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>
Subject: Re: linux-next: manual merge of the devicetree tree with the iommu tree

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