Received-SPF: pass (google.com: domain of linux-kernel+bounces-45924-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240131115838.4af8131c@canb.auug.org.au>
In-Reply-To: <20240131115838.4af8131c@canb.auug.org.au>
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Date: Wed, 31 Jan 2024 08:29:57 +0100
Message-ID: <CACMJSetH-v-NLD+p3D4adqAkFo3UwEpWczX4dysR288KzZv0CQ@mail.gmail.com>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the jc_docs tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>, Jonathan Corbet <corbet@lwn.net>, Kent Gibson <warthog618@gmail.com>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"

On Wed, 31 Jan 2024 at 01:59, 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/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

Looks good, thanks!

Bart