Re: linux-next: manual merge of the jc_docs tree with the char-misc.current tree

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Wed, Aug 05, 2026 at 01:34:46PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/process/coding-assistants.rst
> 
> between commit:
> 
>   3d7c44f73765d ("docs: coding-assistant: explain important steps when looking for bugs")
> 
> from the char-misc.current tree and commits:
> 
>   d699a5da10394 ("docs: link AI coding assistants and tool-generated content pages")
>   816d9992d9ed4 ("coding-assistants: simplify attribution")
> 
> 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/coding-assistants.rst
> index e71df7d28467e,e62c9577d91a2..0000000000000
> --- a/Documentation/process/coding-assistants.rst
> +++ b/Documentation/process/coding-assistants.rst
> @@@ -56,41 -56,4 +56,41 @@@ Basic development tools (git, gcc, make
>   
>   Example::
>   
> -   Assisted-by: Claude:claude-3-opus coccinelle sparse
> +   Assisted-by: LLM coccinelle sparse

Looks good to me, thanks!

greg k-h