Merge remote-tracking branch 'ceph/master'

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

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

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

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

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