Commit 2942242d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-07-24-18-03' of... 

Merge tag 'mm-hotfixes-stable-2025-07-24-18-03' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "11 hotfixes. 9 are cc:stable and the remainder address post-6.15
  issues or aren't considered necessary for -stable kernels.

  7 are for MM"

* tag 'mm-hotfixes-stable-2025-07-24-18-03' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  sprintf.h requires stdarg.h
  resource: fix false warning in __request_region()
  mm/damon/core: commit damos_quota_goal->nid
  kasan: use vmalloc_dump_obj() for vmalloc error reports
  mm/ksm: fix -Wsometimes-uninitialized from clang-21 in advisor_mode_show()
  mm: update MAINTAINERS entry for HMM
  nilfs2: reject invalid file types when reading inodes
  selftests/mm: fix split_huge_page_test for folio_split() tests
  mailmap: add entry for Senozhatsky
  mm/zsmalloc: do not pass __GFP_MOVABLE if CONFIG_COMPACTION=n
  mm/vmscan: fix hwpoisoned large folio handling in shrink_folio_list
parents 94ce1ac2 0dec7201

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -694,6 +694,10 @@ Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de> 
Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>

Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>

Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>

Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky.work@gmail.com>

Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@gmail.com>

Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by>

Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>

Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,10 @@ N: Thomas Gleixner 
E: tglx@linutronix.de

D: NAND flash hardware support, JFFS2 on NAND flash



N: Jérôme Glisse

E: jglisse@redhat.com

D: HMM - Heterogeneous Memory Management



N: Richard E. Gooch

E: rgooch@atnf.csiro.au

D: parent process death signal to children

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -11009,7 +11009,8 @@ F: Documentation/ABI/testing/debugfs-hisi-zip 
F:	drivers/crypto/hisilicon/zip/









HMM - Heterogeneous Memory Management









M:	Jérôme Glisse <jglisse@redhat.com>









M:	Jason Gunthorpe <jgg@nvidia.com>









M:	Leon Romanovsky <leonro@nvidia.com>









L:	linux-mm@kvack.org









S:	Maintained









F:	Documentation/mm/hmm.rst
































fs/nilfs2/inode.c



+8
−1






























Original line number
Diff line number
Diff line







@@ -472,11 +472,18 @@ static int __nilfs_read_inode(struct super_block *sb,







		inode->i_op = &nilfs_symlink_inode_operations;









		inode_nohighmem(inode);









		inode->i_mapping->a_ops = &nilfs_aops;









	} else {









	} else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||









		   S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {









		inode->i_op = &nilfs_special_inode_operations;









		init_special_inode(









			inode, inode->i_mode,









			huge_decode_dev(le64_to_cpu(raw_inode->i_device_code)));









	} else {









		nilfs_error(sb,









			    "invalid file type bits in mode 0%o for inode %lu",









			    inode->i_mode, ino);









		err = -EIO;









		goto failed_unmap;









	}









	nilfs_ifile_unmap_inode(raw_inode);









	brelse(bh);
































include/linux/sprintf.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -4,6 +4,7 @@

















#include <linux/compiler_attributes.h>









#include <linux/types.h>









#include <linux/stdarg.h>



















int num_to_str(char *buf, int size, unsigned long long num, unsigned int width);