From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=884e00f37d8b8464de6b1a5ee456957e530d6d8a;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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