tree 4069743339aeca5a77a58eedb694621471af4683
parent 8d4ef4e15ec57eec5d24fb109fbc220eea9f0caf
parent 38f340ccdf9ed5f1350505b46c5689d015967057
author Linus Torvalds <torvalds@linux-foundation.org> 1507305705 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1507305705 -0700
mergetag object 38f340ccdf9ed5f1350505b46c5689d015967057
 type commit
 tag ceph-for-4.14-rc4
 tagger Ilya Dryomov <idryomov@gmail.com> 1507298479 +0200
 
 Two fixups for CephFS snapshot-handling patches in -rc1.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJZ142+AAoJEEp/3jgCEfOLPdQH/0wFtTLG7sKhEBVndsDUG8u0
 RUtLBE4dXFJU7IlLQOuAkD4GvC4XqttLIJs7bkUwSUu7Vk3+2OKk0JvUq2qKFl03
 tM5sWIqX5FkL9nenivV28YI6rOPHyghVXttVw/4xy5QYLJ1G3OoJpGPJOE44v5v9
 w96guw+EEaPWyn8+/SBhEkfpVAR2fRXe4UDKiLzGYLqYNYiGSSd90j/7F8I4uaNG
 hpQ6aJVJOzNoTQtfmsGyZ0DHuBD8/CSQOIumXdICegDk7stEVGaxSlkBX2ZwwR2q
 jwxIRj6ItM+jDORSgaVAhQ6NJktCxs+scfNFgu8MlQ+RaTOSnEkcvigA7DIVMrw=
 =h2CQ
 -----END PGP SIGNATURE-----

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