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

diff --cc fs/9p/vfs_inode.c
Simple merge

diff --cc fs/bad_inode.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc fs/fat/namei_msdos.c
Simple merge

diff --cc fs/fat/namei_vfat.c
Simple merge

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

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

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

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

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

diff --cc fs/libfs.c
Simple merge

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

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

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

diff --cc fs/ocfs2/alloc.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc mm/shmem.c
Simple merge