Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.

diff --cc fs/userfaultfd.c
Simple merge

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

diff --cc kernel/trace/trace_events_user.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/gup_test.c
Simple merge

diff --cc mm/khugepaged.c
Simple merge

diff --cc mm/mprotect.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc mm/zswap.c
Simple merge

diff --cc tools/testing/selftests/mm/Makefile
Simple merge