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

[Stephen Rothwell]

Hi all,

On Fri, 21 Nov 2025 14:25:12 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/platform/Kconfig
> index 6bb645aed3d1,324c69c63f76..000000000000
> --- a/drivers/platform/Kconfig
> +++ b/drivers/platform/Kconfig
> @@@ -19,4 -19,4 +19,6 @@@ source "drivers/platform/x86/Kconfig
>   
>   source "drivers/platform/arm64/Kconfig"
>   
>  +source "drivers/platform/wmi/Kconfig"
> ++
> + source "drivers/platform/raspberrypi/Kconfig"
> diff --cc drivers/platform/Makefile
> index 533f500dfcff,b0935c602ada..000000000000
> --- a/drivers/platform/Makefile
> +++ b/drivers/platform/Makefile
> @@@ -13,4 -13,4 +13,5 @@@ obj-$(CONFIG_CHROME_PLATFORMS)	+= chrom
>   obj-$(CONFIG_CZNIC_PLATFORMS)	+= cznic/
>   obj-$(CONFIG_SURFACE_PLATFORMS)	+= surface/
>   obj-$(CONFIG_ARM64_PLATFORM_DEVICES)	+= arm64/
>  +obj-$(CONFIG_ACPI_WMI)		+= wmi/
> + obj-$(CONFIG_BCM2835_VCHIQ)	+= raspberrypi/

This is now a conflict between the drivers-x86 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpPEW8hPFmRs.pgp
Description: OpenPGP digital signature