]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'mm-hotfixes-stable' into mm-stable to pick up the series
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 2 Jun 2026 22:06:49 +0000 (15:06 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Tue, 2 Jun 2026 22:06:49 +0000 (15:06 -0700)
"userfaultfd: verify VMA state across UFFDIO_COPY retry", which is a
prerequisite for mm-unnstable's series "userfaultfd: merge
fs/userfaultfd.c into mm/userfaultfd.c".

1  2 
include/linux/mm.h
mm/damon/ops-common.c
mm/huge_memory.c
mm/hugetlb.c
mm/memcontrol.c
mm/memory-failure.c

Simple merge
Simple merge
Simple merge
diff --cc mm/hugetlb.c
Simple merge
diff --cc mm/memcontrol.c
Simple merge
Simple merge