Merge remote-tracking branch 'ovl/for-viro' into for-linus

Overlayfs-related series from Miklos and Amir

diff --cc drivers/block/loop.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_dmabuf.c
Simple merge

diff --cc fs/aio.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/splice.c
Simple merge

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

diff --cc mm/mmap.c
Simple merge

diff --cc mm/nommu.c
Simple merge