Commit 0fd39af2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-06-27-16-56' of... 

Merge tag 'mm-hotfixes-stable-2025-06-27-16-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "16 hotfixes.

  6 are cc:stable and the remainder address post-6.15 issues or aren't
  considered necessary for -stable kernels. 5 are for MM"

* tag 'mm-hotfixes-stable-2025-06-27-16-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  MAINTAINERS: add Lorenzo as THP co-maintainer
  mailmap: update Duje Mihanović's email address
  selftests/mm: fix validate_addr() helper
  crashdump: add CONFIG_KEYS dependency
  mailmap: correct name for a historical account of Zijun Hu
  mailmap: add entries for Zijun Hu
  fuse: fix runtime warning on truncate_folio_batch_exceptionals()
  scripts/gdb: fix dentry_name() lookup
  mm/damon/sysfs-schemes: free old damon_sysfs_scheme_filter->memcg_path on write
  mm/alloc_tag: fix the kmemleak false positive issue in the allocation of the percpu variable tag->counters
  lib/group_cpus: fix NULL pointer dereference from group_cpus_evenly()
  mm/hugetlb: remove unnecessary holding of hugetlb_lock
  MAINTAINERS: add missing files to mm page alloc section
  MAINTAINERS: add tree entry to mm init block
  mm: add OOM killer maintainer structure
  fs/proc/task_mmu: fix PAGE_IS_PFNZERO detection for the huge zero folio
parents 867b9987 c0cb210a

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com> 
Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

Drew Fustini <fustini@kernel.org> <drew@pdp7.com>

<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>

Ed L. Cashin <ecashin@coraid.com>

Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>

Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
@@ -831,3 +832,6 @@ Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com> 
Yusuke Goda <goda.yusuke@renesas.com>

Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>

Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

Zijun Hu <zijun.hu@oss.qualcomm.com> <quic_zijuhu@quicinc.com>

Zijun Hu <zijun.hu@oss.qualcomm.com> <zijuhu@codeaurora.org>

Zijun Hu <zijun_hu@htc.com>

MAINTAINERS

+23 −1
Original line number Diff line number Diff line
@@ -15676,6 +15676,8 @@ MEMBLOCK AND MEMORY MANAGEMENT INITIALIZATION 
M:	Mike Rapoport <rppt@kernel.org>

L:	linux-mm@kvack.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git for-next

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git fixes

F:	Documentation/core-api/boot-time-mm.rst

F:	Documentation/core-api/kho/bindings/memblock/*

F:	include/linux/memblock.h
@@ -15848,6 +15850,17 @@ F: mm/numa.c 
F:	mm/numa_emulation.c

F:	mm/numa_memblks.c









MEMORY MANAGEMENT - OOM KILLER









M:	Michal Hocko <mhocko@suse.com>









R:	David Rientjes <rientjes@google.com>









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









L:	linux-mm@kvack.org









S:	Maintained









F:	include/linux/oom.h









F:	include/trace/events/oom.h









F:	include/uapi/linux/oom.h









F:	mm/oom_kill.c

















MEMORY MANAGEMENT - PAGE ALLOCATOR









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









M:	Vlastimil Babka <vbabka@suse.cz>








@@ -15862,8 +15875,17 @@ F:	include/linux/compaction.h







F:	include/linux/gfp.h









F:	include/linux/page-isolation.h









F:	mm/compaction.c









F:	mm/debug_page_alloc.c









F:	mm/fail_page_alloc.c









F:	mm/page_alloc.c









F:	mm/page_ext.c









F:	mm/page_frag_cache.c









F:	mm/page_isolation.c









F:	mm/page_owner.c









F:	mm/page_poison.c









F:	mm/page_reporting.c









F:	mm/show_mem.c









F:	mm/shuffle.c

















MEMORY MANAGEMENT - RECLAIM









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








@@ -15923,9 +15945,9 @@ F:	mm/swapfile.c







MEMORY MANAGEMENT - THP (TRANSPARENT HUGE PAGE)









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









M:	David Hildenbrand <david@redhat.com>









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









R:	Zi Yan <ziy@nvidia.com>









R:	Baolin Wang <baolin.wang@linux.alibaba.com>









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









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









R:	Nico Pache <npache@redhat.com>









R:	Ryan Roberts <ryan.roberts@arm.com>
































fs/fuse/inode.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -9,6 +9,7 @@







#include "fuse_i.h"









#include "dev_uring_i.h"



















#include <linux/dax.h>









#include <linux/pagemap.h>









#include <linux/slab.h>









#include <linux/file.h>








@@ -162,6 +163,9 @@ static void fuse_evict_inode(struct inode *inode)







	/* Will write inode on close/munmap and in all other dirtiers */









	WARN_ON(inode->i_state & I_DIRTY_INODE);



















	if (FUSE_IS_DAX(inode))









		dax_break_layout_final(inode);



















	truncate_inode_pages_final(&inode->i_data);









	clear_inode(inode);









	if (inode->i_sb->s_flags & SB_ACTIVE) {
































fs/proc/task_mmu.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2182,7 +2182,7 @@ static unsigned long pagemap_thp_category(struct pagemap_scan_private *p,







				categories |= PAGE_IS_FILE;









		}



















		if (is_zero_pfn(pmd_pfn(pmd)))









		if (is_huge_zero_pmd(pmd))









			categories |= PAGE_IS_PFNZERO;









		if (pmd_soft_dirty(pmd))









			categories |= PAGE_IS_SOFT_DIRTY;
































include/linux/kmemleak.h



+4
−0






























Original line number
Diff line number
Diff line







@@ -28,6 +28,7 @@ extern void kmemleak_update_trace(const void *ptr) __ref;







extern void kmemleak_not_leak(const void *ptr) __ref;









extern void kmemleak_transient_leak(const void *ptr) __ref;









extern void kmemleak_ignore(const void *ptr) __ref;









extern void kmemleak_ignore_percpu(const void __percpu *ptr) __ref;









extern void kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) __ref;









extern void kmemleak_no_scan(const void *ptr) __ref;









extern void kmemleak_alloc_phys(phys_addr_t phys, size_t size,








@@ -97,6 +98,9 @@ static inline void kmemleak_not_leak(const void *ptr)







static inline void kmemleak_transient_leak(const void *ptr)









{









}









static inline void kmemleak_ignore_percpu(const void __percpu *ptr)









{









}









static inline void kmemleak_ignore(const void *ptr)









{









}