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

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

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

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

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

diff --cc lib/maple_tree.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/mempolicy.c
Simple merge

diff --cc mm/swapfile.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc mm/zsmalloc.c
Simple merge

diff --cc tools/testing/selftests/mm/hugetlb-madvise.c
Simple merge