Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jun 2014 17:34:17 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jun 2014 17:34:17 +0000 (10:34 -0700)
commit15e52d9a81a66fba97488541bb29c91954a3f4c7
tree9239f7fc9b59d772f850d0aa3d5902507c754026
parentd91d66e88ea95b6dd21958834414009614385153
parent9638556a276125553549fdfe349c464481ec2f39
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This fixes a corner case for cloned RBD images"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: handle parent_overlap on writes correctly