]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3a9e19e0badd31790db9094811b5dc2f75479158
tree9239f7fc9b59d772f850d0aa3d5902507c754026
parent4f83c807921d5c1540a76755e92b3de777ced306
parenteb0adcbb3cc405bd43ce9a4267f58a6883a871ce
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