Merge branch 'mm-hotfixes-stable' into mm-stable to pick up "mm/shmem,

swap: fix race of truncate and swap entry split", needed for merging "mm,
swap: cleanup swap entry management workflow".

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

diff --cc mm/mm_init.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/swap.h
Simple merge

diff --cc mm/swap_state.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge