Merge remote-tracking branch 'vfs-miklos/next'

diff --cc drivers/staging/lustre/lustre/llite/namei.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

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

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc fs/f2fs/namei.c
Simple merge

diff --cc fs/nfs/internal.h
Simple merge

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

diff --cc fs/overlayfs/overlayfs.h
Simple merge

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

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