Merge remote-tracking branch 'ovl/for-viro' into for-linus
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 2 Mar 2017 11:41:22 +0000 (06:41 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 2 Mar 2017 11:41:22 +0000 (06:41 -0500)
Overlayfs-related series from Miklos and Amir

1  2 
drivers/block/loop.c
drivers/gpu/drm/i915/i915_gem_dmabuf.c
fs/aio.c
fs/namei.c
fs/splice.c
include/linux/fs.h
mm/mmap.c
mm/nommu.c

Simple merge
diff --cc fs/aio.c
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/splice.c
Simple merge
Simple merge
diff --cc mm/mmap.c
Simple merge
diff --cc mm/nommu.c
Simple merge