linux-kernel - Re: linux-next: manual merge of the gpio-brgl tree with the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <87r0hx7f75.fsf@meer.lwn.net>
Date: Wed, 31 Jan 2024 07:25:18 -0700
From: Jonathan Corbet <corbet@....net>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Bartosz Golaszewski
 <brgl@...ev.pl>
Cc: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>, Kent Gibson
 <warthog618@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the jc_docs
 tree

Stephen Rothwell <sfr@...b.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