lkml.org 
[lkml]   [2024]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the gpio-brgl tree with the jc_docs tree
Date
Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> Documentation/userspace-api/index.rst
>
> between commit:
>
> 8722435d325b ("docs: rework the userspace-api top page")
>
> from the jc_docs tree and commit:
>
> 32a0a0da530e ("Documentation: gpio: add chardev userspace API documentation")
>
> from the gpio-brgl tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

That seems like a fine fix. Part of the purpose of the userspace-api
reorg was to, hopefully, reduce the frequency of these conflicts going
forward...

Thanks,

jon

\
 
 \ /
  Last update: 2024-05-27 14:43    [W:0.362 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site