From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Jan 2015 23:13:56 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: firefly_0821_release~176^2~2450
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=884e00f37d8b8464de6b1a5ee456957e530d6d8a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fixes from Sage Weil:
 "These paches from Ilya finally squash a race condition with layered
  images that he's been chasing for a while"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: drop parent_ref in rbd_dev_unprobe() unconditionally
  rbd: fix rbd_dev_parent_get() when parent_overlap == 0
---

884e00f37d8b8464de6b1a5ee456957e530d6d8a