Commit 03cc3579 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-02-01-03-56' of... 

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()
  ...
parents c6fe03a3 e5b2a356

.mailmap

+6 −1
Original line number Diff line number Diff line
@@ -150,7 +150,9 @@ Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com> 
Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>

Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>

Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>

Carlos Bilbao <carlos.bilbao.osdev@gmail.com> <carlos.bilbao@amd.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
@@ -167,6 +169,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com> 
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>

Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>

Christoph Hellwig <hch@lst.de>

Chuck Lever <chuck.lever@oracle.com> <cel@kernel.org>

Chuck Lever <chuck.lever@oracle.com> <cel@netapp.com>
@@ -263,6 +266,7 @@ Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com> 
Guru Das Srinagesh <quic_gurus@quicinc.com> <gurus@codeaurora.org>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>

Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
@@ -763,6 +767,7 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de> 
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>

Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>

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>

Documentation/translations/sp_SP/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Traducción al español 


	\kerneldocCJKoff



:maintainer: Carlos Bilbao <carlos.bilbao.osdev@gmail.com>

:maintainer: Carlos Bilbao <carlos.bilbao@kernel.org>



.. _sp_disclaimer:

MAINTAINERS

+7 −5
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ F: drivers/video/fbdev/geode/ 








AMD HSMP DRIVER









M:	Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>









R:	Carlos Bilbao <carlos.bilbao.osdev@gmail.com>









R:	Carlos Bilbao <carlos.bilbao@kernel.org>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









F:	Documentation/arch/x86/amd_hsmp.rst








@@ -5857,7 +5857,7 @@ F:	drivers/usb/atm/cxacru.c















CONFIDENTIAL COMPUTING THREAT MODEL FOR X86 VIRTUALIZATION (SNP/TDX)









M:	Elena Reshetova <elena.reshetova@intel.com>









M:	Carlos Bilbao <carlos.bilbao.osdev@gmail.com>









M:	Carlos Bilbao <carlos.bilbao@kernel.org>









S:	Maintained









F:	Documentation/security/snp-tdx-threat-model.rst
















@@ -11331,7 +11331,7 @@ S:	Orphan







F:	drivers/video/fbdev/imsttfb.c

















INDEX OF FURTHER KERNEL DOCUMENTATION









M:	Carlos Bilbao <carlos.bilbao.osdev@gmail.com>









M:	Carlos Bilbao <carlos.bilbao@kernel.org>









S:	Maintained









F:	Documentation/process/kernel-docs.rst
















@@ -22215,7 +22215,7 @@ Q:	http://patchwork.linuxtv.org/project/linux-media/list/







F:	drivers/media/dvb-frontends/sp2*

















SPANISH DOCUMENTATION









M:	Carlos Bilbao <carlos.bilbao.osdev@gmail.com>









M:	Carlos Bilbao <carlos.bilbao@kernel.org>









R:	Avadhut Naik <avadhut.naik@amd.com>









S:	Maintained









F:	Documentation/translations/sp_SP/








@@ -25739,11 +25739,13 @@ F:	arch/x86/entry/vdso/







XARRAY









M:	Matthew Wilcox <willy@infradead.org>









L:	linux-fsdevel@vger.kernel.org









L:	linux-mm@kvack.org









S:	Supported









F:	Documentation/core-api/xarray.rst









F:	include/linux/idr.h









F:	include/linux/xarray.h









F:	lib/idr.c









F:	lib/test_xarray.c









F:	lib/xarray.c









F:	tools/testing/radix-tree
















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















ZSWAP COMPRESSED SWAP CACHING









M:	Johannes Weiner <hannes@cmpxchg.org>









M:	Yosry Ahmed <yosryahmed@google.com>









M:	Yosry Ahmed <yosry.ahmed@linux.dev>









M:	Nhat Pham <nphamcs@gmail.com>









R:	Chengming Zhou <chengming.zhou@linux.dev>









L:	linux-mm@kvack.org

























arch/m68k/configs/amiga_defconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -626,6 +626,7 @@ CONFIG_TEST_PRINTF=m







CONFIG_TEST_SCANF=m









CONFIG_TEST_BITMAP=m









CONFIG_TEST_UUID=m









CONFIG_TEST_XARRAY=m









CONFIG_TEST_MAPLE_TREE=m









CONFIG_TEST_RHASHTABLE=m









CONFIG_TEST_IDA=m
































arch/m68k/configs/apollo_defconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -583,6 +583,7 @@ CONFIG_TEST_PRINTF=m







CONFIG_TEST_SCANF=m









CONFIG_TEST_BITMAP=m









CONFIG_TEST_UUID=m









CONFIG_TEST_XARRAY=m









CONFIG_TEST_MAPLE_TREE=m









CONFIG_TEST_RHASHTABLE=m









CONFIG_TEST_IDA=m