tree 9239f7fc9b59d772f850d0aa3d5902507c754026
parent d91d66e88ea95b6dd21958834414009614385153
parent 9638556a276125553549fdfe349c464481ec2f39
author Linus Torvalds <torvalds@linux-foundation.org> 1403717657 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1403717657 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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