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