Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Oct 2015 19:47:02 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Oct 2015 19:47:02 +0000 (12:47 -0700)
commit59bcce121691da06c6b027088d38b76ba893e0cb
tree6b642eed0deb0aff9c5ffcfd6210a80da056bf92
parenta4c4c49a611321d1b10379f72f1267802437fc07
parente30b7577bf1d338ca8a273bd2f881de5a41572b7
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fixes from Sage Weil:
 "Just two small items from Ilya:

  The first patch fixes the RBD readahead to grab full objects.  The
  second fixes the write ops to prevent undue promotion when a cache
  tier is configured on the server side"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: use writefull op for object size writes
  rbd: set max_sectors explicitly