]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6bf6030 6019aad)
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)
commitdf0713b43cdea2b586758bf69ee74e43f147be88
treec3652b03bd0dc739a93d8edd083961170b4d0da9tree | snapshot
parent6bf6030ee864e4895b388a957668a059fda34453commit | diff
parent6019aad78dd64133a8ddb89172d3f1c2bc1d440dcommit | diff
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
Linux Kernel Source Tree.