Merge remote-tracking branch 'ext4/dev'

diff --cc fs/btrfs/disk-io.c
Simple merge

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

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

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

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