Merge tag 'ceph-for-4.12-rc4' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jun 2017 19:03:07 +0000 (12:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jun 2017 19:03:07 +0000 (12:03 -0700)
commit65d03328aace31043be98f807f6e20332cdb19c8
tree762fc34b1fbabd93d31e4768ed74082917e35411
parent60c42a31dc0fd307098486221dcb43b59057110f
parent6ac56951dc10232e24419f6972fc8131dd0166e0
Merge tag 'ceph-for-4.12-rc4' of git://github.com/ceph/ceph-client

Pull ceph fix from Ilya Dryomov:
 "A small fix for rbd FALLOC_FL_ZERO_RANGE/PUNCH_HOLE handling breakage
  introduced in -rc1"

* tag 'ceph-for-4.12-rc4' of git://github.com/ceph/ceph-client:
  rbd: implement REQ_OP_WRITE_ZEROES