projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a5ed1e9 9d4a227)
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)
commit9a1050ad83e2a5db84436b11e10facd7d4a5ab26
tree46045735b06ac1b5bffe620f48e98c406350720atree | snapshot
parenta5ed1e96cafde5ba48638f486bfca0685dc6ddc9commit | diff
parent9d4a227f6ef189cf37eb22641f6ee788b7dc41bbcommit | diff
Merge tag 'ceph-for-5.1-rc2' of git://github.com/ceph/ceph-client

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
John Crispins staging tree