Merge branch 'master' into mm-stable

author akpm <akpm@linux-foundation.org>

Mon, 27 Jun 2022 17:31:34 +0000 (10:31 -0700)

committer akpm <akpm@linux-foundation.org>

Mon, 27 Jun 2022 17:31:34 +0000 (10:31 -0700)
author akpm <akpm@linux-foundation.org>
Mon, 27 Jun 2022 17:31:34 +0000 (10:31 -0700)
committer akpm <akpm@linux-foundation.org>
Mon, 27 Jun 2022 17:31:34 +0000 (10:31 -0700)
diff --cc mm/memcontrol.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge
author	akpm <akpm@linux-foundation.org>
	Mon, 27 Jun 2022 17:31:34 +0000 (10:31 -0700)
committer	akpm <akpm@linux-foundation.org>
	Mon, 27 Jun 2022 17:31:34 +0000 (10:31 -0700)
		1	2
mm/memcontrol.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/vmalloc.c	patch \|	diff1 \|	diff2 \|	blob \| history