From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Hans de Goede <hdegoede@redhat•com>, Mark Gross <markgross@kernel•org>
Cc: "Greg KH" <greg@kroah•com>, "Armin Wolf" <W_Armin@gmx•de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation•org>,
"Ilpo Järvinen" <ilpo.jarvinen@linux•intel.com>,
"Jai Luthra" <jai.luthra@ideasonboard•com>,
"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 staging tree with the drivers-x86 tree
Date: Mon, 8 Dec 2025 11:39:44 +1100 [thread overview]
Message-ID: <20251208113944.659f25cc@canb.auug.org.au> (raw)
In-Reply-To: <20251121142512.371a77fe@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1868 bytes --]
Hi all,
On Fri, 21 Nov 2025 14:25:12 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-12-08 0:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-21 3:25 linux-next: manual merge of the staging tree with the drivers-x86 tree Stephen Rothwell
2025-11-21 4:49 ` Armin Wolf
2025-12-08 0:39 ` Stephen Rothwell [this message]
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=20251208113944.659f25cc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=W_Armin@gmx$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hdegoede@redhat$(echo .)com \
--cc=ilpo.jarvinen@linux$(echo .)intel.com \
--cc=jai.luthra@ideasonboard$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markgross@kernel$(echo .)org \
/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