]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'memblock-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Apr 2026 18:29:14 +0000 (11:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Apr 2026 18:29:14 +0000 (11:29 -0700)
Pull memblock updates from Mike Rapoport:

 - improve debuggability of reserve_mem kernel parameter handling with
   print outs in case of a failure and debugfs info showing what was
   actually reserved

 - Make memblock_free_late() and free_reserved_area() use the same core
   logic for freeing the memory to buddy and ensure it takes care of
   updating memblock arrays when ARCH_KEEP_MEMBLOCK is enabled.

* tag 'memblock-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  x86/alternative: delay freeing of smp_locks section
  memblock: warn when freeing reserved memory before memory map is initialized
  memblock, treewide: make memblock_free() handle late freeing
  memblock: make free_reserved_area() update memblock if ARCH_KEEP_MEMBLOCK=y
  memblock: extract page freeing from free_reserved_area() into a helper
  memblock: make free_reserved_area() more robust
  mm: move free_reserved_area() to mm/memblock.c
  powerpc: opal-core: pair alloc_pages_exact() with free_pages_exact()
  powerpc: fadump: pair alloc_pages_exact() with free_pages_exact()
  memblock: reserve_mem: fix end caclulation in reserve_mem_release_by_name()
  memblock: move reserve_bootmem_range() to memblock.c and make it static
  memblock: Add reserve_mem debugfs info
  memblock: Print out errors on reserve_mem parser

13 files changed:
1  2 
arch/arm64/mm/init.c
arch/x86/platform/efi/quirks.c
drivers/of/kexec.c
include/linux/memblock.h
include/linux/mm.h
init/initramfs.c
kernel/dma/swiotlb.c
lib/bootconfig.c
mm/internal.h
mm/kfence/core.c
mm/memblock.c
mm/mm_init.c
mm/page_alloc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/internal.h
Simple merge
Simple merge
diff --cc mm/memblock.c
Simple merge
diff --cc mm/mm_init.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge