Re: [PATCH] docs: kdoc: strip DOMAIN_NS() wrapper in function prototypes
From: Omokefe Emmanuel Onanaroghene
Date: Wed Oct 14 2026 - 20:53:35 EST
On Wed, 14 Oct 2026 11:22:02 -0600, Jonathan Corbet <corbet@xxxxxxx> wrote:
>> Neither of these patches applies to docs-next...what did you base them
>> on?
>
> Hi Jon,
>
> I had mistakenly based both patches on mainline rather than docs-next.
> I have rebased both on top of docs-next and sent a v2 for each:
>
> - docs: kdoc: handle TRACE_EVENT_FN() family in tracepoint parser:
> https://lore.kernel.org/all/20261014223134.14772-1-emmaonana18@xxxxxxxxx/
>
> - docs: kdoc: strip DOMAIN_NS() wrapper in function prototypes:
> https://lore.kernel.org/all/20261014223437.16164-1-emmaonana18@xxxxxxxxx/
>
I just noticed another mistake on my part, because I prepared
the two v2 patches on separate independent branches off docs-next, both
patches add their regression test at the exact same location in
tools/unittests/test_kdoc_parser.py (line 444). Applying them sequentially will
cause a merge conflict
I didn't realize that patches modifying the exact same context in a file
should be stacked sequentially on a single branch as a patch series
rather than developed on separate branches.
Should I respin them as a 2-patch series against docs-next,
or would you prefer to resolve when applying?
Thanks,
Omokefe