summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-25 10:34:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-25 10:34:17 -0700
commit15e52d9a81a66fba97488541bb29c91954a3f4c7 (patch)
tree9239f7fc9b59d772f850d0aa3d5902507c754026 /include
parentd91d66e88ea95b6dd21958834414009614385153 (diff)
parent9638556a276125553549fdfe349c464481ec2f39 (diff)
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions