linux-kernel - Re: linux-next: manual merge of 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: <20260126225511.GA866955@ax162>
Date: Mon, 26 Jan 2026 15:55:11 -0700
From: Nathan Chancellor <nathan@...nel.org>
To: Mark <broonie@...nel.org>
Cc: Jonathan Corbet <corbet@....net>, Guillaume Tucker <gtucker@...cker.io>,
	Jani Nikula <jani.nikula@...el.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 jc_docs tree with the kbuild tree

On Mon, Jan 26, 2026 at 04:41:51PM +0000, Mark wrote:
> Hi all,
> 
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/dev-tools/index.rst
> 
> between commit:
> 
>   6eac13c876805 ("Documentation: dev-tools: add container.rst page")
> 
> from the kbuild tree and commit:
> 
>   a592a36e49372 ("Documentation: use a source-read extension for the index link boilerplate")
> 
> from the jc_docs 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.
> 
> diff --cc Documentation/dev-tools/index.rst
> index 527a0e4cf2ed8,4fc9d15f91d09..0000000000000
> --- a/Documentation/dev-tools/index.rst
> +++ b/Documentation/dev-tools/index.rst
> @@@ -38,12 -38,3 +38,4 @@@ Documentation/process/debugging/index.r
>      gpio-sloppy-logic-analyzer
>      autofdo
>      propeller
>  +   container
> - 
> - 
> - .. only::  subproject and html
> - 
> -    Indices
> -    =======
> - 
> -    * :ref:`genindex`

Thanks, looks good to me. I have made a note of it for the upcoming
merge window. I assume this conflict is not going to be uncommon :)

Cheers,
Nathan