Messages in this thread | | | Date | Wed, 31 Jan 2024 11:59:25 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the gpio-brgl tree with the jc_docs tree |
| |
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. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc Documentation/userspace-api/index.rst index 67d663cf2ff2,ee58d92c53c7..000000000000 --- a/Documentation/userspace-api/index.rst +++ b/Documentation/userspace-api/index.rst @@@ -30,18 -16,14 +30,19 @@@ Security-related interface no_new_privs seccomp_filter landlock - unshare + lsm spec_ctrl + tee + +Devices and I/O +=============== + +.. toctree:: + :maxdepth: 1 + accelerators/ocxl dma-buf-alloc-exchange - ebpf/index - ELF + gpio/index - ioctl/index iommu iommufd media/index [unhandled content-type:application/pgp-signature] | |