linux-next: manual merge of the jc_docs tree with the origin tree

linux-next: manual merge of the jc_docs tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]

Hi all,

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

  tools/lib/python/kdoc/xforms_lists.py

between commit:

  fd0349aadbb99 ("pid: add helpers to operate on a struct pid array")

from the origin tree and commit:

  4180abdb5d938 ("docs: xforms_lists: Handle DECLARE_KHOSER_PTR() struct members")

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 tools/lib/python/kdoc/xforms_lists.py
index 320f977c5bac2,161acac90ea3b..0000000000000
--- a/tools/lib/python/kdoc/xforms_lists.py
+++ b/tools/lib/python/kdoc/xforms_lists.py
@@@ -45,7 -45,7 +45,8 @@@ class CTransforms
          (CMatch("DECLARE_HASHTABLE"), r"unsigned long \1[1 << ((\2) - 1)]"),
          (CMatch("DECLARE_KFIFO"), r"\2 *\1"),
          (CMatch("DECLARE_KFIFO_PTR"), r"\2 *\1"),
+         (CMatch("DECLARE_KHOSER_PTR"), r"\2 \1"),
 +        (CMatch("DECLARE_PIDS"), r"struct pid *\1[(\2) + 1]"),
          (CMatch("(?:__)?DECLARE_FLEX_ARRAY"), r"\1 \2[]"),
          (CMatch("DEFINE_DMA_UNMAP_ADDR"), r"dma_addr_t \1"),
          (CMatch("DEFINE_DMA_UNMAP_LEN"), r"__u32 \1"),

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: linux-next: manual merge of the jc_docs tree with the origin tree

[Jonathan Corbet]

Mark Brown <broonie@kernel.org> writes:

> Hi all,
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
>   tools/lib/python/kdoc/xforms_lists.py
>
> between commit:
>
>   fd0349aadbb99 ("pid: add helpers to operate on a struct pid array")
>
> from the origin tree and commit:
>
>   4180abdb5d938 ("docs: xforms_lists: Handle DECLARE_KHOSER_PTR() struct members")
>
> from the jc_docs tree.

Interesting...I'm a little surprised to see Christian's change to the
kerneldoc tooling for the first time ... oh well.

> 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 tools/lib/python/kdoc/xforms_lists.py
> index 320f977c5bac2,161acac90ea3b..0000000000000
> --- a/tools/lib/python/kdoc/xforms_lists.py
> +++ b/tools/lib/python/kdoc/xforms_lists.py
> @@@ -45,7 -45,7 +45,8 @@@ class CTransforms
>           (CMatch("DECLARE_HASHTABLE"), r"unsigned long \1[1 << ((\2) - 1)]"),
>           (CMatch("DECLARE_KFIFO"), r"\2 *\1"),
>           (CMatch("DECLARE_KFIFO_PTR"), r"\2 *\1"),
> +         (CMatch("DECLARE_KHOSER_PTR"), r"\2 \1"),
>  +        (CMatch("DECLARE_PIDS"), r"struct pid *\1[(\2) + 1]"),
>           (CMatch("(?:__)?DECLARE_FLEX_ARRAY"), r"\1 \2[]"),
>           (CMatch("DEFINE_DMA_UNMAP_ADDR"), r"dma_addr_t \1"),

The resolution is fine, of course.

Thanks,

jon

linux-next: manual merge of the jc_docs tree with the origin tree

[Mark]

[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]

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
  -----------------

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]