sync mm-stable with mm-hotfixes-stable to pick up depended-upon changes

diff --cc include/linux/damon.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/mmzone.h
Simple merge

diff --cc lib/maple_tree.c
Simple merge

diff --cc mm/damon/core.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/memory-failure.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc mm/workingset.c
Simple merge

diff --cc tools/testing/radix-tree/maple.c
Simple merge