Skip to content

Commit 03cc357

Browse files
committed
Merge tag 'mm-hotfixes-stable-2025-02-01-03-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc fixes from Andrew Morton: "21 hotfixes. 8 are cc:stable and the remainder address post-6.13 issues. 13 are for MM and 8 are for non-MM. All are singletons, please see the changelogs for details" * tag 'mm-hotfixes-stable-2025-02-01-03-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (21 commits) MAINTAINERS: include linux-mm for xarray maintenance revert "xarray: port tests to kunit" MAINTAINERS: add lib/test_xarray.c mailmap, MAINTAINERS, docs: update Carlos's email address mm/hugetlb: fix hugepage allocation for interleaved memory nodes mm: gup: fix infinite loop within __get_longterm_locked mm, swap: fix reclaim offset calculation error during allocation .mailmap: update email address for Christopher Obbard kfence: skip __GFP_THISNODE allocations on NUMA systems nilfs2: fix possible int overflows in nilfs_fiemap() mm: compaction: use the proper flag to determine watermarks kernel: be more careful about dup_mmap() failures and uprobe registering mm/fake-numa: handle cases with no SRAT info mm: kmemleak: fix upper boundary check for physical address objects mailmap: add an entry for Hamza Mahfooz MAINTAINERS: mailmap: update Yosry Ahmed's email address scripts/gdb: fix aarch64 userspace detection in get_current_task mm/vmscan: accumulate nr_demoted for accurate demotion statistics ocfs2: fix incorrect CPU endianness conversion causing mount failure mm/zsmalloc: add __maybe_unused attribute for is_first_zpdesc() ...
2 parents c6fe03a + e5b2a35 commit 03cc357

34 files changed

+386
-448
lines changed

.mailmap

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@ Bryan Tan <[email protected]> <[email protected]>
150150
151151
152152
153-
153+
154+
155+
154156
155157
156158
@@ -167,6 +169,7 @@ Christian Brauner <[email protected]> <[email protected]>
167169
168170
Christian Marangi <[email protected]>
169171
Christophe Ricard <[email protected]>
172+
Christopher Obbard <[email protected]> <[email protected]>
170173
Christoph Hellwig <[email protected]>
171174
172175
@@ -263,6 +266,7 @@ Guo Ren <[email protected]> <[email protected]>
263266
Guru Das Srinagesh <[email protected]> <[email protected]>
264267
Gustavo Padovan <[email protected]>
265268
Gustavo Padovan <[email protected]>
269+
266270
267271
268272
@@ -763,6 +767,7 @@ Wolfram Sang <[email protected]> <[email protected]>
763767
764768
765769
770+
766771
Yusuke Goda <[email protected]>
767772
768773

Documentation/translations/sp_SP/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Traducción al español
77

88
\kerneldocCJKoff
99

10-
:maintainer: Carlos Bilbao <carlos.bilbao[email protected]>
10+
:maintainer: Carlos Bilbao <carlos.bilbao@kernel.org>
1111

1212
.. _sp_disclaimer:
1313

MAINTAINERS

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ F: drivers/video/fbdev/geode/
10901090

10911091
AMD HSMP DRIVER
10921092
M: Naveen Krishna Chatradhi <[email protected]>
1093-
R: Carlos Bilbao <carlos.bilbao[email protected]>
1093+
R: Carlos Bilbao <carlos.bilbao@kernel.org>
10941094
10951095
S: Maintained
10961096
F: Documentation/arch/x86/amd_hsmp.rst
@@ -5857,7 +5857,7 @@ F: drivers/usb/atm/cxacru.c
58575857

58585858
CONFIDENTIAL COMPUTING THREAT MODEL FOR X86 VIRTUALIZATION (SNP/TDX)
58595859
M: Elena Reshetova <[email protected]>
5860-
M: Carlos Bilbao <carlos.bilbao[email protected]>
5860+
M: Carlos Bilbao <carlos.bilbao@kernel.org>
58615861
S: Maintained
58625862
F: Documentation/security/snp-tdx-threat-model.rst
58635863

@@ -11331,7 +11331,7 @@ S: Orphan
1133111331
F: drivers/video/fbdev/imsttfb.c
1133211332

1133311333
INDEX OF FURTHER KERNEL DOCUMENTATION
11334-
M: Carlos Bilbao <carlos.bilbao[email protected]>
11334+
M: Carlos Bilbao <carlos.bilbao@kernel.org>
1133511335
S: Maintained
1133611336
F: Documentation/process/kernel-docs.rst
1133711337

@@ -22215,7 +22215,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/
2221522215
F: drivers/media/dvb-frontends/sp2*
2221622216

2221722217
SPANISH DOCUMENTATION
22218-
M: Carlos Bilbao <carlos.bilbao[email protected]>
22218+
M: Carlos Bilbao <carlos.bilbao@kernel.org>
2221922219
R: Avadhut Naik <[email protected]>
2222022220
S: Maintained
2222122221
F: Documentation/translations/sp_SP/
@@ -25739,11 +25739,13 @@ F: arch/x86/entry/vdso/
2573925739
XARRAY
2574025740
M: Matthew Wilcox <[email protected]>
2574125741
25742+
2574225743
S: Supported
2574325744
F: Documentation/core-api/xarray.rst
2574425745
F: include/linux/idr.h
2574525746
F: include/linux/xarray.h
2574625747
F: lib/idr.c
25748+
F: lib/test_xarray.c
2574725749
F: lib/xarray.c
2574825750
F: tools/testing/radix-tree
2574925751

@@ -26223,7 +26225,7 @@ K: zstd
2622326225

2622426226
ZSWAP COMPRESSED SWAP CACHING
2622526227
M: Johannes Weiner <[email protected]>
26226-
M: Yosry Ahmed <[email protected]>
26228+
M: Yosry Ahmed <[email protected]>
2622726229
M: Nhat Pham <[email protected]>
2622826230
R: Chengming Zhou <[email protected]>
2622926231

arch/m68k/configs/amiga_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,7 @@ CONFIG_TEST_PRINTF=m
626626
CONFIG_TEST_SCANF=m
627627
CONFIG_TEST_BITMAP=m
628628
CONFIG_TEST_UUID=m
629+
CONFIG_TEST_XARRAY=m
629630
CONFIG_TEST_MAPLE_TREE=m
630631
CONFIG_TEST_RHASHTABLE=m
631632
CONFIG_TEST_IDA=m

arch/m68k/configs/apollo_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ CONFIG_TEST_PRINTF=m
583583
CONFIG_TEST_SCANF=m
584584
CONFIG_TEST_BITMAP=m
585585
CONFIG_TEST_UUID=m
586+
CONFIG_TEST_XARRAY=m
586587
CONFIG_TEST_MAPLE_TREE=m
587588
CONFIG_TEST_RHASHTABLE=m
588589
CONFIG_TEST_IDA=m

arch/m68k/configs/atari_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ CONFIG_TEST_PRINTF=m
603603
CONFIG_TEST_SCANF=m
604604
CONFIG_TEST_BITMAP=m
605605
CONFIG_TEST_UUID=m
606+
CONFIG_TEST_XARRAY=m
606607
CONFIG_TEST_MAPLE_TREE=m
607608
CONFIG_TEST_RHASHTABLE=m
608609
CONFIG_TEST_IDA=m

arch/m68k/configs/bvme6000_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,7 @@ CONFIG_TEST_PRINTF=m
575575
CONFIG_TEST_SCANF=m
576576
CONFIG_TEST_BITMAP=m
577577
CONFIG_TEST_UUID=m
578+
CONFIG_TEST_XARRAY=m
578579
CONFIG_TEST_MAPLE_TREE=m
579580
CONFIG_TEST_RHASHTABLE=m
580581
CONFIG_TEST_IDA=m

arch/m68k/configs/hp300_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,7 @@ CONFIG_TEST_PRINTF=m
585585
CONFIG_TEST_SCANF=m
586586
CONFIG_TEST_BITMAP=m
587587
CONFIG_TEST_UUID=m
588+
CONFIG_TEST_XARRAY=m
588589
CONFIG_TEST_MAPLE_TREE=m
589590
CONFIG_TEST_RHASHTABLE=m
590591
CONFIG_TEST_IDA=m

arch/m68k/configs/mac_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,7 @@ CONFIG_TEST_PRINTF=m
602602
CONFIG_TEST_SCANF=m
603603
CONFIG_TEST_BITMAP=m
604604
CONFIG_TEST_UUID=m
605+
CONFIG_TEST_XARRAY=m
605606
CONFIG_TEST_MAPLE_TREE=m
606607
CONFIG_TEST_RHASHTABLE=m
607608
CONFIG_TEST_IDA=m

arch/m68k/configs/multi_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,7 @@ CONFIG_TEST_PRINTF=m
689689
CONFIG_TEST_SCANF=m
690690
CONFIG_TEST_BITMAP=m
691691
CONFIG_TEST_UUID=m
692+
CONFIG_TEST_XARRAY=m
692693
CONFIG_TEST_MAPLE_TREE=m
693694
CONFIG_TEST_RHASHTABLE=m
694695
CONFIG_TEST_IDA=m

0 commit comments

Comments
 (0)