Merge branch 'mm-stable' into mm-unstable

diff --cc kernel/fork.c
Simple merge

diff --cc lib/maple_tree.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/khugepaged.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/swapfile.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge