mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the kexec tree with the mm tree
@ 2026-11-16 19:25 Mark Brown
  2026-11-16 19:42 ` Andrew Morton
  0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2026-11-16 19:25 UTC (permalink / raw)
  To: Mike Rapoport, Andrew Morton, Pasha Tatashin, Pratyush Yadav
  Cc: David Hildenbrand, Linux Kernel Mailing List,
	Linux Next Mailing List, Mikhail Zaslonko, Usama Arif,
	Vlastimil Babka

[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]

Hi all,

Today's linux-next merge of the kexec tree got a conflict in:

  kernel/crash_reserve.c

between commit:

  ed27d3cb114dd ("mm/hugetlb: allow crashkernel to reuse hugetlb CMA memory")

from the mm tree and commit:

  941aef93e9e1d ("kdump: Give crashkernel CMA areas unique names")

from the kexec 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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-16 19:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-16 19:25 linux-next: manual merge of the kexec tree with the mm tree Mark Brown
2026-11-16 19:42 ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®