]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jan 2015 23:13:56 +0000 (15:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jan 2015 23:13:56 +0000 (15:13 -0800)
commit7c72668ec03c36bcba1fc74a0543dc25b6bbcc26
treec3652b03bd0dc739a93d8edd083961170b4d0da9
parent81ef212f8a92b2a84455aa51aded2c2c4fbff142
parentc8dd9122259db96dd846f5c4175730c2bc978afb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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