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

Conflicts:
	fs/stat.c
	kernel/events/core.c

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

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

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

diff --cc fs/locks.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/ocfs2/cluster/heartbeat.c
Simple merge

diff --cc fs/stat.c
Simple merge

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

diff --cc mm/mmap.c
Simple merge

diff --cc net/9p/trans_fd.c
Simple merge

diff --cc net/socket.c
Simple merge