From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jun 2017 19:03:07 +0000 (-0700)
Subject: Merge tag 'ceph-for-4.12-rc4' of git://github.com/ceph/ceph-client
X-Git-Tag: v4.12-rc4~16
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=65d03328aace31043be98f807f6e20332cdb19c8

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
---

65d03328aace31043be98f807f6e20332cdb19c8