Skip to contentSkip to conversation

hotfixes for 6.1-rc5

GIT PULL Merged Andrew Morton 3 participants 3 messages Nov 12, 2022 – Nov 14, 2022 Memory management

lore
Share & tools
lore

Andrew Morton

author maintainer
#0 lore raw

Linus, please merge this batch of hotfixes.

Thanks.

The following changes since commit f0c4d9fc9cc9462659728d168387191387e903cc:

Linux 6.1-rc4 (2022-11-06 15:07:11 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2022-11-11

for you to fetch changes up to 436fa4a699bcd1c368bea9199e22b0a1b9cf9e0f:

docs: kmsan: fix formatting of "Example report" (2022-11-08 15:57:25 -0800)

----------------------------------------------------------------
22 hotfixes. 8 are cc:stable and the remainder address issues which were introduced post-6.0 or which aren't considered serious enough to justify a -stable backport.

----------------------------------------------------------------
Alexander Potapenko (6):
kmsan: core: kmsan_in_runtime() should return true in NMI context x86/uaccess: instrument copy_from_user_nmi() Kconfig.debug: ensure early check for KMSAN in CONFIG_KMSAN_WARN
kmsan: make sure PREEMPT_RT is off
x86/traps: avoid KMSAN bugs originating from handle_bug()
docs: kmsan: fix formatting of "Example report"

James Houghton (1):
hugetlbfs: don't delete error page from pagecache

Johannes Weiner (1):
fs: fix leaked psi pressure state

Li Zetao (1):
mm/mmap: fix memory leak in mmap_region()

Liam Howlett (5):
maple_tree: remove pointer to pointer use in mas_alloc_nodes()
maple_tree: mas_anode_descend() clang-analyzer cleanup
maple_tree: reorganize testing to restore module testing
maple_tree: fix depth tracking in maple_state
maple_tree: don't set a new maximum on the node when not reusing nodes

Naoya Horiguchi (1):
arch/x86/mm/hugetlbpage.c: pud_huge() returns 0 when using 2-level paging

Pankaj Gupta (1):
mm/memremap.c: map FS_DAX device memory as decrypted

Peter Xu (2):
Partly revert "mm/thp: carry over dirty bit when thp splits on pmd" mm/shmem: use page_mapping() to detect page cache for uffd continue

Ryusuke Konishi (2):
nilfs2: fix deadlock in nilfs_count_free_blocks()
nilfs2: fix use-after-free bug of ns_writer on remount

SeongJae Park (1):
mm/damon/dbgfs: check if rm_contexts input is for a real context

Vasily Gorbik (1):
mm: hugetlb_vmemmap: include missing linux/moduleparam.h

 Documentation/dev-tools/kmsan.rst             |     1 +
 arch/x86/kernel/traps.c                       |     7 +
 arch/x86/lib/usercopy.c                       |     3 +
 arch/x86/mm/hugetlbpage.c                     |     4 +
 fs/btrfs/compression.c                        |    14 +-
 fs/erofs/zdata.c                              |    18 +-
 fs/hugetlbfs/inode.c                          |    13 +-
 fs/nilfs2/segment.c                           |    15 +-
 fs/nilfs2/super.c                             |     2 -
 fs/nilfs2/the_nilfs.c                         |     2 -
 include/linux/maple_tree.h                    |     7 +
 lib/Kconfig.debug                             |     6 +-
 lib/Kconfig.kmsan                             |     1 +
 lib/Makefile                                  |     1 +
 lib/maple_tree.c                              |    58 +-
 lib/test_maple_tree.c                         | 37926 +-----------------------
 mm/damon/dbgfs.c                              |     7 +
 mm/huge_memory.c                              |     9 +-
 mm/hugetlb.c                                  |     4 +
 mm/hugetlb_vmemmap.c                          |     1 +
 mm/kmsan/kmsan.h                              |     2 +
 mm/memory-failure.c                           |     5 +-
 mm/memremap.c                                 |     1 +
 mm/mmap.c                                     |     6 +-
 mm/userfaultfd.c                              |     2 +-
 tools/testing/radix-tree/.gitignore           |     1 +
 tools/testing/radix-tree/Makefile             |    19 +-
 tools/testing/radix-tree/generated/autoconf.h |     2 +-
 tools/testing/radix-tree/linux.c              |     4 +
 tools/testing/radix-tree/maple.c              | 35770 ++++++++++++++++++++++
 30 files changed, 37118 insertions(+), 36793 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 11 Nov 2022 17:12:02 -0800:

The pull request you sent on Fri, 11 Nov 2022 17:12:02 -0800:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2022-11-11

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d7c2b1f64e44c98206752a1599b0203ae5e92f27

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
#2 lore raw
In reply to Andrew Morton

Hi Liam,

Quoted 21 lines · Andrew Morton

Linus, please merge this batch of hotfixes.

Thanks.

The following changes since commit f0c4d9fc9cc9462659728d168387191387e903cc:

Linux 6.1-rc4 (2022-11-06 15:07:11 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2022-11-11

for you to fetch changes up to 436fa4a699bcd1c368bea9199e22b0a1b9cf9e0f:

docs: kmsan: fix formatting of "Example report" (2022-11-08 15:57:25 -0800)

----------------------------------------------------------------
22 hotfixes. 8 are cc:stable and the remainder address issues which were introduced post-6.0 or which aren't considered serious enough to justify a -stable backport.

Quoted 6 lines

----------------------------------------------------------------

Liam Howlett (5):
maple_tree: remove pointer to pointer use in mas_alloc_nodes()
maple_tree: mas_anode_descend() clang-analyzer cleanup
maple_tree: reorganize testing to restore module testing

Thanks for your patch, which is now commit 120b116208a08772 ("maple_tree: reorganize testing to restore module testing") in v6.1-rc5.

+config TEST_MAPLE_TREE
+ select DEBUG_MAPLE_TREE
+ tristate "Test the Maple Tree code at runtime"
+

There are two problems with this:

1. If CONFIG_DEBUG_KERNEL=n:

WARNING: unmet direct dependencies detected for DEBUG_MAPLE_TREE
Depends on [n]: DEBUG_KERNEL [=n]
Selected by [m]:
- TEST_MAPLE_TREE [=m] && RUNTIME_TESTING_MENU [=y]

2. IMHO test code should not silently enable additional features, as it prevents providing a test module for a production system, without having any other impact on that system.

Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds