Messages in this thread | | | From | Jonathan Corbet <> | Subject | Re: linux-next: manual merge of the gpio-brgl tree with the jc_docs tree | Date | Wed, 31 Jan 2024 07:25:18 -0700 |
| |
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
| |