Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree tree

From: Krzysztof Kozlowski <[email-masked]>
Date: Mon, 23 May 2022 16:33:45 +0200

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