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

From: Mark Brown

Date: Mon Nov 16 2026 - 14:26:20 EST


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;

Attachment: signature.asc
Description: PGP signature