From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Jun 2014 17:34:17 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: v3.16-rc3~23
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=15e52d9a81a66fba97488541bb29c91954a3f4c7;p=~emulex%2Finfiniband.git

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
---

15e52d9a81a66fba97488541bb29c91954a3f4c7