Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

diff --cc .mailmap
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/configs/debug_defconfig
Simple merge

diff --cc arch/s390/configs/defconfig
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_svm.c
Simple merge

diff --cc fs/fuse/dir.c
Simple merge

diff --cc fs/fuse/file.c
Simple merge

diff --cc fs/xfs/xfs_super.c
Simple merge

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

diff --cc kernel/events/uprobes.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/truncate.c
Simple merge