]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'ceph-for-5.1-rc2' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Mar 2019 17:04:47 +0000 (10:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Mar 2019 17:04:47 +0000 (10:04 -0700)
Pull ceph fixes from Ilya Dryomov:
 "A follow up for the new alloc_size logic and a blacklisting fix,
  marked for stable"

* tag 'ceph-for-5.1-rc2' of git://github.com/ceph/ceph-client:
  rbd: drop wait_for_latest_osdmap()
  libceph: wait for latest osdmap in ceph_monc_blacklist_add()
  rbd: set io_min, io_opt and discard_granularity to alloc_size


Trivial merge