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] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 23 May 2022 16:33:45 +0200
From:   Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
To:     Jassi Brar <jaswinder.singh@...aro.org>,
        Rob Herring <robherring2@...il.com>
Cc:     David Heidelberg <david@...t.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Herring <robh@...nel.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree
 tree

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?


Best regards,
Krzysztof