Skip to contentSkip to conversation

hotfixes for 6.4-rc2

GIT PULL Merged Andrew Morton 2 participants 2 messages May 18, 2023 – May 19, 2023 Memory management

lore
Share & tools
lore

Andrew Morton

author maintainer
#0 lore raw

Linus, please merge this small batch of hotfixes.

There is a minor conflict in MAINTAINERS.

Thanks.

The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:

Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2023-05-18-15-52

for you to fetch changes up to c7394fa9aa4ccd4e477626c4f7aef0b360c92efb:

MAINTAINERS: Cleanup Arm Display IP maintainers (2023-05-17 15:24:34 -0700)

----------------------------------------------------------------
Eight hotfixes. Four are cc:stable, the other four are for post-6.4 issues, or aren't considered suitable for backporting.

----------------------------------------------------------------
Domenico Cerasuolo (1):
mm: fix zswap writeback race condition

Joan Bruguera Micó (1):
mm: shrinkers: fix race condition on debugfs cleanup

Liviu Dudau (1):
MAINTAINERS: Cleanup Arm Display IP maintainers

Lukas Bulwahn (1):
MAINTAINERS: repair pattern in DIALOG SEMICONDUCTOR DRIVERS

Michael Ellerman (1):
mm: kfence: fix false positives on big endian

Nhat Pham (1):
zsmalloc: move LRU update from zs_map_object() to zs_malloc()

Peng Zhang (1):
maple_tree: make maple state reusable after mas_empty_area()

Ryusuke Konishi (1):
nilfs2: fix use-after-free bug of nilfs_root in nilfs_evict_inode()

 MAINTAINERS              |  7 +------
 fs/nilfs2/inode.c        | 18 ++++++++++++++++++
 include/linux/shrinker.h | 13 +++++++++++--
 lib/maple_tree.c         | 12 +++---------
 mm/kfence/kfence.h       |  2 +-
 mm/shrinker_debug.c      | 15 ++++++++++-----
 mm/vmscan.c              |  5 +++--
 mm/zsmalloc.c            | 36 +++++++++---------------------------
 mm/zswap.c               | 16 ++++++++++++++++
 9 files changed, 72 insertions(+), 52 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Thu, 18 May 2023 15:56:06 -0700:

The pull request you sent on Thu, 18 May 2023 15:56:06 -0700:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2023-05-18-15-52

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

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html