Merge branch 'mm-stable' into mm-unstable

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

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

diff --cc mm/gup.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

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

diff --cc mm/memory.c
Simple merge

diff --cc mm/memremap.c
Simple merge

diff --cc mm/rmap.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/sparse-vmemmap.c
Simple merge