From: Jonathan Corbet <corbet@lwn•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
"Michael S. Tsirkin" <mst@redhat•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vhost tree with Linus' tree
Date: Mon, 17 Nov 2025 08:21:30 -0700 [thread overview]
Message-ID: <87o6p0d6rp.fsf@trenco.lwn.net> (raw)
In-Reply-To: <20251117165118.2163d5e7@canb.auug.org.au>
Stephen Rothwell <sfr@canb•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
next prev parent reply other threads:[~2025-11-17 15:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-17 5:51 linux-next: manual merge of the vhost tree with Linus' tree Stephen Rothwell
2025-11-17 6:29 ` Stephen Rothwell
2025-11-17 15:21 ` Jonathan Corbet [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-19 23:05 Stephen Rothwell
2021-09-06 2:28 Stephen Rothwell
2021-09-06 2:56 ` Yongji Xie
2019-12-04 3:00 Stephen Rothwell
2019-12-09 0:40 ` Stephen Rothwell
2019-01-03 1:39 Stephen Rothwell
2015-07-24 3:59 Stephen Rothwell
2015-07-08 1:43 Stephen Rothwell
2013-05-09 2:04 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o6p0d6rp.fsf@trenco.lwn.net \
--to=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox