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

To pick up depended-upon changes

diff --cc fs/aio.c
Simple merge

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

diff --cc mm/gup.c
Simple merge

diff --cc mm/kasan/common.c
Simple merge

diff --cc mm/kasan/generic.c
Simple merge

diff --cc mm/ksm.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/swapfile.c
Simple merge

diff --cc mm/vmscan.c
Simple merge