Merge branch 'mm-hotfixes-stable' into mm-stable in order to pick up

changes required by mm-stable material: hugetlb and damon.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/zram/zram_drv.c
Simple merge

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

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

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

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

diff --cc mm/gup.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/khugepaged.c
Simple merge

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

diff --cc mm/swap.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge

diff --cc mm/vmscan.c
Simple merge