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

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

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

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

diff --cc fs/ceph/super.h
Simple merge

diff --cc include/linux/ceph/libceph.h
Simple merge

diff --cc net/ceph/osd_client.c
Simple merge