Skip to contentSkip to conversation

hotfixes for 6.1 final

GIT PULL Merged Andrew Morton 3 participants 3 messages Dec 11, 2022 Memory management

lore
Share & tools
lore

Andrew Morton

author maintainer
#0 lore raw

Linus, please merge this final batch of hotfixes for 6.1, thanks.

The following changes since commit 1d351f1894342c378b96bb9ed89f8debb1e24e9f:

revert "kbuild: fix -Wimplicit-function-declaration in license_is_gpl_compatible" (2022-11-30 14:49:42 -0800)

are available in the Git repository at:

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

for you to fetch changes up to 4a7ba45b1a435e7097ca0f79a847d0949d0eb088:

memcg: fix possible use-after-free in memcg_write_event_control() (2022-12-09 18:41:17 -0800)

----------------------------------------------------------------
9 hotfixes. 6 for MM, 3 for other areas. Four of these patches address post-6.0 issues.

----------------------------------------------------------------
David Hildenbrand (1):
mm/swap: fix SWP_PFN_BITS with CONFIG_PHYS_ADDR_T_64BIT on 32bit

Hugh Dickins (1):
tmpfs: fix data loss from failed fallocate

Jason A. Donenfeld (1):
mm: do not BUG_ON missing brk mapping, because userspace can unmap it

John Starks (1):
mm/gup: fix gup_pud_range() for dax

Liam Howlett (1):
mmap: fix do_brk_flags() modifying obviously incorrect VMAs

Matti Vaittinen (1):
mailmap: update Matti Vaittinen's email address

Michal Hocko (1):
kselftests: cgroup: update kmem test precision tolerance

Muchun Song (1):
MAINTAINERS: update Muchun Song's email

Tejun Heo (1):
memcg: fix possible use-after-free in memcg_write_event_control()

 .mailmap                                   |  3 +++
 MAINTAINERS                                |  4 ++--
 include/linux/cgroup.h                     |  1 +
 include/linux/swapops.h                    |  8 +++++---
 kernel/cgroup/cgroup-internal.h            |  1 -
 mm/gup.c                                   |  2 +-
 mm/memcontrol.c                            | 15 +++++++++++++--
 mm/mmap.c                                  | 14 ++++----------
 mm/shmem.c                                 | 11 +++++++++++
 tools/testing/selftests/cgroup/test_kmem.c |  6 +++---
 10 files changed, 43 insertions(+), 22 deletions(-)
#1 lore raw
Quoted 3 lines · Andrew Morton

Tejun Heo (1):
memcg: fix possible use-after-free in memcg_write_event_control()

Heh. Apparently your scripts to notice that some patch already made it upstream didn't notice that I took this one directly already when it was posted, so now it's duplicated.

Not a big deal.

Linus

merge bot Merged
#2 lore raw
In reply to Andrew Morton
The pull request you sent on Sat, 10 Dec 2022 17:03:17 -0800:

The pull request you sent on Sat, 10 Dec 2022 17:03:17 -0800:

Quoted 1 line

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

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

Thank you!

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