linux-kernel - Re: linux-next: manual merge of the mailbox tree with the devicetree 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_Jsq+ohio4ELL=RszN2vavg_sZ9S-N0R_TeQ9qpjB+ehCwTA@mail.gmail.com>
Date:   Mon, 23 May 2022 09:39:57 -0500
From:   Rob Herring <robherring2@...il.com>
To:     Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
Cc:     Jassi Brar <jaswinder.singh@...aro.org>,
        David Heidelberg <david@...t.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree tree

On Mon, May 23, 2022 at 9:33 AM Krzysztof Kozlowski
<krzysztof.kozlowski@...aro.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