Re: linux-next: manual merge of the gpio-brgl tree with the devicetree tree

[Rob Herring]

On Tue, Jun 22, 2021 at 2:16 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   Documentation/devicetree/bindings/gpio/gpio-davinci.txt
>
> between commit:
>
>   c601eef1e258 ("dt-bindings: clock: update ti,sci-clk.yaml references")
>
> from the devicetree tree and commit:
>
>   c830b87a761b ("dt-bindings: gpio: gpio-davinci: Convert to json-schema")
>
> from the gpio-brgl tree.
>
> I fixed it up (the latter removed the file, so I did that) and can
> carry the fix as necessary.

As the reference is gone in the schema, that is the correct resolution.

Rob