Merge tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Oct 2017 16:01:45 +0000 (09:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Oct 2017 16:01:45 +0000 (09:01 -0700)
commitb77779b93d7a38d9a7f3462b83f6e6fadb6b9ce5
tree4069743339aeca5a77a58eedb694621471af4683
parent8d4ef4e15ec57eec5d24fb109fbc220eea9f0caf
parent38f340ccdf9ed5f1350505b46c5689d015967057
Merge tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:
 "Two fixups for CephFS snapshot-handling patches in -rc1"

* tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client:
  ceph: fix __choose_mds() for LSSNAP request
  ceph: properly queue cap snap for newly created snap realm