Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
MIME-Version: 1.0
References: <20220523140525.4ad591d0@canb.auug.org.au> <4d5c0dee-b32a-158c-e243-de2c4af7e103@linaro.org>
In-Reply-To: <4d5c0dee-b32a-158c-e243-de2c4af7e103@linaro.org>
From:   Rob Herring <robherring2@gmail.com>
Date:   Mon, 23 May 2022 09:39:57 -0500
Message-ID: <CAL_Jsq+ohio4ELL=RszN2vavg_sZ9S-N0R_TeQ9qpjB+ehCwTA@mail.gmail.com>
Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree tree
To:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc:     Jassi Brar <jaswinder.singh@linaro.org>,
        David Heidelberg <david@ixit.cz>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, May 23, 2022 at 9:33 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 23/05/2022 06:05, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the mailbox tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
> >
> > between commit:
> >
> >   b20eee62ee89 ("dt-bindings: mailbox: qcom-ipcc: add missing properties into example")
>
> This commit should be rather dropped, because it duplicated my work
> which entirely removed the example.
>
> Rob,
> Can you drop that commit from your tree?

No, but I've reverted it.

Rob