merge mm-hotfixes-stable into mm-nonmm-stable to pick up needed changes

2026-09-28 19:20:30 +00:00 · 2024-04-25 20:54:12 -07:00 · 2024-04-25 20:54:12 -07:00 · 5d1bc76058
commit 5d1bc76058
parent 640958fde1 52ccdde16b
28 changed files with 417 additions and 375 deletions
--- a/.mailmap
+++ b/.mailmap
--- a/Documentation/mm/page_owner.rst
+++ b/Documentation/mm/page_owner.rst
--- a/2
+++ b/2
--- a/fs/nilfs2/dir.c
+++ b/fs/nilfs2/dir.c
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
--- a/fs/squashfs/inode.c
+++ b/fs/squashfs/inode.c
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
--- a/include/linux/swapops.h
+++ b/include/linux/swapops.h
--- a/include/trace/events/mmflags.h
+++ b/include/trace/events/mmflags.h
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/vmcore_info.c
+++ b/kernel/vmcore_info.c
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
--- a/mm/gup.c
+++ b/mm/gup.c
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
--- a/mm/internal.h
+++ b/mm/internal.h
--- a/mm/madvise.c
+++ b/mm/madvise.c
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
--- a/mm/shmem.c
+++ b/mm/shmem.c
--- a/mm/zswap.c
+++ b/mm/zswap.c
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
--- a/tools/testing/selftests/mm/mdwe_test.c
+++ b/tools/testing/selftests/mm/mdwe_test.c
--- a/tools/testing/selftests/mm/protection_keys.c
+++ b/tools/testing/selftests/mm/protection_keys.c
--- a/tools/testing/selftests/mm/run_vmtests.sh
+++ b/tools/testing/selftests/mm/run_vmtests.sh
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c