Commit 6fea5fab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-04-19-21-24' of... 

Merge tag 'mm-hotfixes-stable-2025-04-19-21-24' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc hotfixes from Andrew Morton:
 "16 hotfixes. 2 are cc:stable and the remainder address post-6.14
  issues or aren't considered necessary for -stable kernels.

  All patches are basically for MM although five are alterations to
  MAINTAINERS"

[ Basic counting skills are clearly not a strictly necessary requirement
  for kernel maintainers.     - Linus ]

* tag 'mm-hotfixes-stable-2025-04-19-21-24' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  MAINTAINERS: add section for locking of mm's and VMAs
  mm: vmscan: fix kswapd exit condition in defrag_mode
  mm: vmscan: restore high-cpu watermark safety in kswapd
  MAINTAINERS: add Pedro as reviewer to the MEMORY MAPPING section
  mm/memory: move sanity checks in do_wp_page() after mapcount vs. refcount stabilization
  mm, hugetlb: increment the number of pages to be reset on HVO
  writeback: fix false warning in inode_to_wb()
  docs: ABI: replace mcroce@microsoft.com with new Meta address
  mm/gup: fix wrongly calculated returned value in fault_in_safe_writeable()
  MAINTAINERS: add memory advice section
  MAINTAINERS: add mmap trace events to MEMORY MAPPING
  mm: memcontrol: fix swap counter leak from offline cgroup
  MAINTAINERS: add MM subsection for the page allocator
  MAINTAINERS: update SLAB ALLOCATOR maintainers
  fs/dax: fix folio splitting issue by resetting old folio order + _nr_pages
  mm/page_alloc: fix deadlock on cpu_hotplug_lock in __accept_page()
parents 119009db ea21641b

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2071,6 +2071,10 @@ S: 660 Harvard Ave. #7 
S: Santa Clara, CA 95051

S: USA



N: Joonsoo Kim

E: iamjoonsoo.kim@lge.com

D: Slab allocators



N: Kukjin Kim

E: kgene@kernel.org

D: Samsung S3C, S5P and Exynos ARM architectures

Documentation/ABI/stable/sysfs-block

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ Description: 


What:		/sys/block/<disk>/diskseq

Date:		February 2021

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:

		The /sys/block/<disk>/diskseq files reports the disk

		sequence number, which is a monotonically increasing

Documentation/ABI/testing/sysfs-kernel-reboot

+5 −5
Original line number Diff line number Diff line 
What:		/sys/kernel/reboot

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	Interface to set the kernel reboot behavior, similarly to

		what can be done via the reboot= cmdline option.

		(see Documentation/admin-guide/kernel-parameters.txt)
@@ -9,25 +9,25 @@ Description: Interface to set the kernel reboot behavior, similarly to 
What:		/sys/kernel/reboot/mode

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	Reboot mode. Valid values are: cold warm hard soft gpio



What:		/sys/kernel/reboot/type

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	Reboot type. Valid values are: bios acpi kbd triple efi pci



What:		/sys/kernel/reboot/cpu

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	CPU number to use to reboot.



What:		/sys/kernel/reboot/force

Date:		November 2020

KernelVersion:	5.11

Contact:	Matteo Croce <mcroce@microsoft.com>

Contact:	Matteo Croce <teknoraver@meta.com>

Description:	Don't wait for any other CPUs on reboot and

		avoid anything that could hang.

MAINTAINERS

+47 −2
Original line number Diff line number Diff line
@@ -15517,6 +15517,21 @@ F: mm/numa.c 
F:	mm/numa_emulation.c

F:	mm/numa_memblks.c









MEMORY MANAGEMENT - PAGE ALLOCATOR









M:	Andrew Morton <akpm@linux-foundation.org>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Suren Baghdasaryan <surenb@google.com>









R:	Michal Hocko <mhocko@suse.com>









R:	Brendan Jackman <jackmanb@google.com>









R:	Johannes Weiner <hannes@cmpxchg.org>









R:	Zi Yan <ziy@nvidia.com>









L:	linux-mm@kvack.org









S:	Maintained









F:	mm/compaction.c









F:	mm/page_alloc.c









F:	include/linux/gfp.h









F:	include/linux/compaction.h

















MEMORY MANAGEMENT - SECRETMEM









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Mike Rapoport <rppt@kernel.org>








@@ -15544,10 +15559,12 @@ M:	Liam R. Howlett <Liam.Howlett@oracle.com>







M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Jann Horn <jannh@google.com>









R:	Pedro Falcato <pfalcato@suse.de>









L:	linux-mm@kvack.org









S:	Maintained









W:	http://www.linux-mm.org









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm









F:	include/trace/events/mmap.h









F:	mm/mlock.c









F:	mm/mmap.c









F:	mm/mprotect.c








@@ -15558,6 +15575,36 @@ F:	mm/vma.h







F:	mm/vma_internal.h









F:	tools/testing/vma/

















MEMORY MAPPING - LOCKING









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Suren Baghdasaryan <surenb@google.com>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Shakeel Butt <shakeel.butt@linux.dev>









L:	linux-mm@kvack.org









S:	Maintained









W:	http://www.linux-mm.org









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm









F:	Documentation/mm/process_addrs.rst









F:	include/linux/mmap_lock.h









F:	include/trace/events/mmap_lock.h









F:	mm/mmap_lock.c

















MEMORY MAPPING - MADVISE (MEMORY ADVICE)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









M:	David Hildenbrand <david@redhat.com>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Jann Horn <jannh@google.com>









L:	linux-mm@kvack.org









S:	Maintained









W:	http://www.linux-mm.org









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm









F:	include/uapi/asm-generic/mman-common.h









F:	mm/madvise.c

















MEMORY TECHNOLOGY DEVICES (MTD)









M:	Miquel Raynal <miquel.raynal@bootlin.com>









M:	Richard Weinberger <richard@nod.at>








@@ -22250,9 +22297,7 @@ F:	drivers/nvmem/layouts/sl28vpd.c















SLAB ALLOCATOR









M:	Christoph Lameter <cl@linux.com>









M:	Pekka Enberg <penberg@kernel.org>









M:	David Rientjes <rientjes@google.com>









M:	Joonsoo Kim <iamjoonsoo.kim@lge.com>









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Vlastimil Babka <vbabka@suse.cz>









R:	Roman Gushchin <roman.gushchin@linux.dev>

























fs/dax.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -396,6 +396,7 @@ static inline unsigned long dax_folio_put(struct folio *folio)







	order = folio_order(folio);









	if (!order)









		return 0;









	folio_reset_order(folio);



















	for (i = 0; i < (1UL << order); i++) {









		struct dev_pagemap *pgmap = page_pgmap(&folio->page);