lkml.org 
[lkml]   [2021]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the gpio-brgl tree with the devicetree tree
On Tue, Jun 22, 2021 at 2:16 AM Stephen Rothwell <sfr@canb.auug.org.au> 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

\
 
 \ /
  Last update: 2021-06-23 19:27    [W:0.031 / U:0.944 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site