projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d91d66e 9638556)
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
tree9239f7fc9b59d772f850d0aa3d5902507c754026tree | snapshot
parentd91d66e88ea95b6dd21958834414009614385153commit | diff
parent9638556a276125553549fdfe349c464481ec2f39commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.