Subject: Re: linux-next: manual merge of the staging tree with the drivers-x86 tree

From: Armin Wolf <[email-masked]>
Date: Fri, 21 Nov 2025 05:49:51 +0100

Am 21.11.25 um 04:25 schrieb Stephen Rothwell:

> Hi all,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
>    drivers/platform/Kconfig
>    drivers/platform/Makefile
>
> between commit:
>
>    e2c1b56f3dfa ("platform/x86: wmi: Move WMI core code into a separate directory")
>
> from the drivers-x86 tree and commit:
>
>    aa125180c673 ("platform/raspberrypi: Destage VCHIQ interface")
>
> from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

The fixup seems fine to me as far as the WMI driver core is concerned, but
the entries for the Raspberry Pi seem to contain some leading whitespaces.

Thanks,
Armin Wolf