linux-kernel - 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>] [day] [month] [year] [list]

Message-ID: <aXeZWtQK4q-wtprc@sirena.org.uk>
Date: Mon, 26 Jan 2026 16:42:02 +0000
From: Mark <broonie@...nel.org>
To: Jonathan Corbet <corbet@....net>
Cc: Dan Williams <dan.j.williams@...el.com>,
	Dave Hansen <dave.hansen@...ux.intel.com>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Sasha Levin <sashal@...nel.org>
Subject: linux-next: manual merge of the jc_docs tree with the origin tree

Hi all,

Today's linux-next merge of the jc_docs tree got a conflict in:

  Documentation/process/index.rst

between commit:

  102606402f4f5 ("Documentation: Project continuity")

from the origin tree and commits:

  78d979db6cef5 ("docs: add AI Coding Assistants documentation")
  a66437c279795 ("Documentation: Provide guidelines for tool-generated content")

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/process/index.rst
index 492b808a69772,7bea184b73385..0000000000000
--- a/Documentation/process/index.rst
+++ b/Documentation/process/index.rst
@@@ -68,7 -68,8 +68,9 @@@ beyond)
     stable-kernel-rules
     management-style
     researcher-guidelines
 +   conclave
+    generated-content
+    coding-assistants
  
  Dealing with bugs
  -----------------

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)