Commit 3ce99258 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-05-10-14-23' of... 

Merge tag 'mm-hotfixes-stable-2025-05-10-14-23' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

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

  About half are for MM. Five OCFS2 fixes and a few MAINTAINERS updates"

* tag 'mm-hotfixes-stable-2025-05-10-14-23' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (22 commits)
  mm: fix folio_pte_batch() on XEN PV
  nilfs2: fix deadlock warnings caused by lock dependency in init_nilfs()
  mm/hugetlb: copy the CMA flag when demoting
  mm, swap: fix false warning for large allocation with !THP_SWAP
  selftests/mm: fix a build failure on powerpc
  selftests/mm: fix build break when compiling pkey_util.c
  mm: vmalloc: support more granular vrealloc() sizing
  tools/testing/selftests: fix guard region test tmpfs assumption
  ocfs2: stop quota recovery before disabling quotas
  ocfs2: implement handshaking with ocfs2 recovery thread
  ocfs2: switch osb->disable_recovery to enum
  mailmap: map Uwe's BayLibre addresses to a single one
  MAINTAINERS: add mm THP section
  mm/userfaultfd: fix uninitialized output field for -EAGAIN race
  selftests/mm: compaction_test: support platform with huge mount of memory
  MAINTAINERS: add core mm section
  ocfs2: fix panic in failed foilio allocation
  mm/huge_memory: fix dereferencing invalid pmd migration entry
  MAINTAINERS: add reverse mapping section
  x86: disable image size check for test builds
  ...
parents 34503098 7b08b74f

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -447,6 +447,8 @@ Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net> 
Luca Weiss <luca@lucaweiss.eu> <luca@z3ntu.xyz>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Luo Jie <quic_luoj@quicinc.com> <luoj@codeaurora.org>

Lance Yang <lance.yang@linux.dev> <ioworker0@gmail.com>

Lance Yang <lance.yang@linux.dev> <mingzhe.yang@ly.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org>

Maharaja Kennadyrajan <quic_mkenna@quicinc.com> <mkenna@codeaurora.org>
@@ -749,6 +751,7 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net> 
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>

Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Uwe Kleine-König <ukleinek@strlen.de>

Uwe Kleine-König <ukl@pengutronix.de>

MAINTAINERS

+62 −4
Original line number Diff line number Diff line
@@ -15495,24 +15495,45 @@ F: Documentation/mm/ 
F:	include/linux/gfp.h

F:	include/linux/gfp_types.h

F:	include/linux/memfd.h

F:	include/linux/memory.h

F:	include/linux/memory_hotplug.h

F:	include/linux/memory-tiers.h

F:	include/linux/mempolicy.h

F:	include/linux/mempool.h

F:	include/linux/memremap.h

F:	include/linux/mm.h

F:	include/linux/mm_*.h

F:	include/linux/mmzone.h

F:	include/linux/mmu_notifier.h

F:	include/linux/pagewalk.h

F:	include/linux/rmap.h

F:	include/trace/events/ksm.h

F:	mm/

F:	tools/mm/

F:	tools/testing/selftests/mm/

N:	include/linux/page[-_]*









MEMORY MANAGEMENT - CORE









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









M:	David Hildenbrand <david@redhat.com>









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









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









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Mike Rapoport <rppt@kernel.org>









R:	Suren Baghdasaryan <surenb@google.com>









R:	Michal Hocko <mhocko@suse.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/linux/memory.h









F:	include/linux/mm.h









F:	include/linux/mm_*.h









F:	include/linux/mmdebug.h









F:	include/linux/pagewalk.h









F:	mm/Kconfig









F:	mm/debug.c









F:	mm/init-mm.c









F:	mm/memory.c









F:	mm/pagewalk.c









F:	mm/util.c

















MEMORY MANAGEMENT - EXECMEM









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









M:	Mike Rapoport <rppt@kernel.org>








@@ -15546,6 +15567,19 @@ F:	mm/page_alloc.c







F:	include/linux/gfp.h









F:	include/linux/compaction.h

















MEMORY MANAGEMENT - RMAP (REVERSE MAPPING)









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









M:	David Hildenbrand <david@redhat.com>









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









R:	Rik van Riel <riel@surriel.com>









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









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Harry Yoo <harry.yoo@oracle.com>









L:	linux-mm@kvack.org









S:	Maintained









F:	include/linux/rmap.h









F:	mm/rmap.c

















MEMORY MANAGEMENT - SECRETMEM









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









M:	Mike Rapoport <rppt@kernel.org>








@@ -15554,6 +15588,30 @@ S:	Maintained







F:	include/linux/secretmem.h









F:	mm/secretmem.c

















MEMORY MANAGEMENT - THP (TRANSPARENT HUGE PAGE)









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









M:	David Hildenbrand <david@redhat.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>









R:	Dev Jain <dev.jain@arm.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:	Documentation/admin-guide/mm/transhuge.rst









F:	include/linux/huge_mm.h









F:	include/linux/khugepaged.h









F:	include/trace/events/huge_memory.h









F:	mm/huge_memory.c









F:	mm/khugepaged.c









F:	tools/testing/selftests/mm/khugepaged.c









F:	tools/testing/selftests/mm/split_huge_page_test.c









F:	tools/testing/selftests/mm/transhuge-stress.c

















MEMORY MANAGEMENT - USERFAULTFD









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









R:	Peter Xu <peterx@redhat.com>
































arch/x86/kernel/vmlinux.lds.S



+9
−1






























Original line number
Diff line number
Diff line







@@ -466,10 +466,18 @@ SECTIONS







}



















/*









 * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility:









 * COMPILE_TEST kernels can be large - CONFIG_KASAN, for example, can cause









 * this.  Let's assume that nobody will be running a COMPILE_TEST kernel and









 * let's assert that fuller build coverage is more valuable than being able to









 * run a COMPILE_TEST kernel.









 */









#ifndef CONFIG_COMPILE_TEST









/*









 * The ASSERT() sync to . is intentional, for binutils 2.14 compatibility:









 */









. = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),









	   "kernel image bigger than KERNEL_IMAGE_SIZE");









#endif



















/* needed for Clang - see arch/x86/entry/entry.S */









PROVIDE(__ref_stack_chk_guard = __stack_chk_guard);
































fs/nilfs2/the_nilfs.c



+0
−3






























Original line number
Diff line number
Diff line







@@ -705,8 +705,6 @@ int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb)







	int blocksize;









	int err;



















	down_write(&nilfs->ns_sem);



















	blocksize = sb_min_blocksize(sb, NILFS_MIN_BLOCK_SIZE);









	if (!blocksize) {









		nilfs_err(sb, "unable to set blocksize");








@@ -779,7 +777,6 @@ int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb)







	set_nilfs_init(nilfs);









	err = 0;









 out:









	up_write(&nilfs->ns_sem);









	return err;



















 failed_sbh:
































fs/ocfs2/alloc.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -6918,6 +6918,7 @@ static int ocfs2_grab_folios(struct inode *inode, loff_t start, loff_t end,







		if (IS_ERR(folios[numfolios])) {









			ret = PTR_ERR(folios[numfolios]);









			mlog_errno(ret);









			folios[numfolios] = NULL;









			goto out;









		}