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

[Jonathan Corbet]

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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