linux-kernel - Re: linux-next: manual merge of the vhost tree with Linus' tree

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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <87o6p0d6rp.fsf@trenco.lwn.net>
Date: Mon, 17 Nov 2025 08:21:30 -0700
From: Jonathan Corbet <corbet@....net>
To: Stephen Rothwell <sfr@...b.auug.org.au>, "Michael S. Tsirkin"
 <mst@...hat.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the vhost tree with Linus' tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the vhost tree got a conflict in:
>
>   scripts/lib/kdoc/kdoc_parser.py
>
> between commit:
>
>   77e3c875f0a8 ("docs: kdoc: split struct-member rewriting out of dump_struct()")
>
> from Linus' tree (and maybe some others) and commit:
>
>   67ae57499e77 ("virtio: clean up features qword/dword terms")
>
> from the vhost tree.

Sigh ... I would really rather not have random trees reaching into the
kerneldoc machinery, especially during a time when said machinery is
under heavy modification.

It looks like v4 takes that hunk out?  I would be glad to carry a
corresponding fix through docs.

Thanks,

jon