From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: Mark Brown <broonie@kernel.org>
Cc: Hans de Goede <hansg@kernel.org>,
Mark Gross <markgross@kernel.org>,
Chipang Kao <chipang_kao@asus.com>,
Daniel Lezcano <daniel.lezcano@oss.qualcomm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mingyou Chen <qby140326@gmail.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the pm tree
Date: Mon, 16 Nov 2026 21:39:47 +0200 (EET) [thread overview]
Message-ID: <c8f4f188-0bd8-05a2-2ca1-af6f5759a4ee@linux.intel.com> (raw)
In-Reply-To: <avtYzidDS9_4b9QU@sirena.org.uk>
On Mon, 16 Nov 2026, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
> drivers/platform/x86/Kconfig
>
> between commit:
>
> 699041135f75b ("platform profile: Extract the core from ACPI")
>
> from the pm tree and commits:
>
> ef696e89f836c ("platform/asus: Move ASUS platform drivers out of drivers/platform/x86")
> 3abfbb21e1c92 ("platform/x86: redmi-wmi: Drop redmi-wmi driver")
>
> from the drivers-x86 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.
>
> diff --cc kernel/crash_reserve.c
> index 53d76ba6b3c31,80092c86d586a..0000000000000
> --- a/kernel/crash_reserve.c
> +++ b/kernel/crash_reserve.c
> @@@ -503,11 -483,16 +503,17 @@@ void __init reserve_crashkernel_cma(voi
> while (cma_size > reserved_size &&
> crashk_cma_cnt < CRASHKERNEL_CMA_RANGES_MAX) {
>
> + char name[CMA_MAX_NAME];
> struct cma *res;
>
> + request_size = min(request_size, cma_size - reserved_size);
> + /* CMA area names show up in sysfs and debugfs, keep them unique */
> + if (crashk_cma_cnt)
> + snprintf(name, sizeof(name), "crashkernel%d", crashk_cma_cnt);
> + else
> + strscpy(name, "crashkernel");
> if (cma_declare_contiguous(0, request_size, 0, 0, 0, false,
> - "crashkernel", &res)) {
> + name, &res)) {
> /* reservation failed, try half-sized blocks */
> if (request_size <= PAGE_SIZE)
> break;
>
That looks a bit funny resolution to a Kconfig conflict... :-)
--
i.
next prev parent reply other threads:[~2026-11-16 19:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 19:26 linux-next: manual merge of the drivers-x86 tree with the pm tree Mark Brown
2026-11-16 19:39 ` Ilpo Järvinen [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-06 0:24 Stephen Rothwell
2022-09-19 4:20 Stephen Rothwell
2022-09-19 7:05 ` Hans de Goede
2022-03-03 2:32 Stephen Rothwell
2015-06-19 5:04 Michael Ellerman
2015-06-19 19:38 ` Darren Hart
2015-06-19 19:38 ` Darren Hart
2014-01-22 5:42 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=c8f4f188-0bd8-05a2-2ca1-af6f5759a4ee@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=broonie@kernel.org \
--cc=chipang_kao@asus.com \
--cc=daniel.lezcano@oss.qualcomm.com \
--cc=hansg@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=qby140326@gmail.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.