Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20211029131854.042d8202@canb.auug.org.au>
In-Reply-To: <20211029131854.042d8202@canb.auug.org.au>
From:   Rob Herring <robherring2@gmail.com>
Date:   Fri, 29 Oct 2021 08:46:38 -0500
Message-ID: <CAL_JsqLqhZAOJxMcdtxe1bAFpYxG6pjRPSK7fVukUMNp2ucCvA@mail.gmail.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the iommu tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Will Deacon <will@kernel.org>
Cc:     Joerg Roedel <joro@8bytes.org>, David Heidelberg <david@ixit.cz>,
        Konrad Dybcio <konrad.dybcio@somainline.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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