Akira Yokosawa <akiyks@xxxxxxxxx> writes:
> Hi Jon,
>
> On Wed, 9 Nov 2022 23:45:06 +0900, Akira Yokosawa wrote:
>> Hi Jon,
>>
>> On Wed, 2 Nov 2022 20:48:01 +0900, Akira Yokosawa wrote:
>>> Since merge of tty-6.0-rc1, "make htmldocs" with Sphinx >=3.1 emits
>>> a bunch of warnings indicating duplicate kernel-doc comments from
>>> drivers/tty/serial/serial_core.c.
>>>
>>> This is due to the kernel-doc directive for serial_core.c in
>>> serial/drivers.rst added in the merge. It conflicts with an existing
>>> kernel-doc directive in miscellaneous.rst.
>>>
>>> Remove the latter directive and resolve the duplicates.
>>>
>>> Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx>
>>> Fixes: 607ca0f742b7 ("Merge tag 'tty-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty")
>>> Cc: stable@xxxxxxxxxxxxxxx # 6.0
>>> Cc: Jiri Slaby <jslaby@xxxxxxx>
>>> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>>> ---
> [...]
>>
>> Jon, Greg has added this to his tty tree and (hopefully) it will
>> soon land Linus' tree (v6.1-rcX).
>> I'll ask you a back-merge once it happens.
>
> This change has landed at v6.1-rc6 as commit 3ec17cb325ac
> ("docs/driver-api/miscellaneous: Remove kernel-doc of serial_core.c").
> Can you please consider backmerging v6.1-rc6?
> There is another fix landed at v6.1-rc5 which fixed another duplicate
> kernel-doc, commit c18c20f16219 ("mm, slab: remove duplicate kernel-doc
> comment for ksize()") authored by Vlastimil.
So the purpose of this backmerge would be just to get rid of a few
warnings in docs-next for the next few weeks? Given the jaundiced eye
with which Linus looks at backmerges, I'm inclined to just wait and let
it all settle out during the merge window. Is there any work that would
be impeded by not doing that merge now?
Thanks,
jon
