git.kernel.dk Git - linux-2.6-block.git/commit

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9a3f21f ac86f54)

author	Andrew Morton <akpm@linux-foundation.org>
	Wed, 1 Feb 2023 01:25:17 +0000 (17:25 -0800)
committer	Andrew Morton <akpm@linux-foundation.org>
	Wed, 1 Feb 2023 01:25:17 +0000 (17:25 -0800)
commit	5ab0fc155dc0cac3b74584f7bc972569b0f8a57b
tree	fb43458b715be3a72c872bc4ce0e7c45e6f76ccb	tree \| snapshot
parent	9a3f21fe5cb9f5654ccad7ba712d868f7de66e39	commit \| diff
parent	ac86f547ca1002aec2ef66b9e64d03f45bbbfbb9	commit \| diff

Sync mm-stable with mm-hotfixes-stable to pick up dependent patches

Merge branch 'mm-hotfixes-stable' into mm-stable

include/linux/hugetlb.h	diff1 \|	diff2 \|	blob \| history
include/linux/memcontrol.h	diff1 \|	diff2 \|	blob \| history
include/linux/swap.h	diff1 \|	diff2 \|	blob \| history
lib/maple_tree.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/mempolicy.c	diff1 \|	diff2 \|	blob \| history
mm/swapfile.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history
mm/zsmalloc.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/mm/hugetlb-madvise.c	diff1 \|	\|	blob \| history

Linux 6.x block layer and io_uring tree(s)