]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6be32eb 18d4dab)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Aug 2015 18:09:07 +0000 (11:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Aug 2015 18:09:07 +0000 (11:09 -0700)
commitf083dc4e345ebb8bcbe0b73ee5394a4ee6e224e3
tree4b29dce3dfc6924e6df0a0ca09916057ae5cc52ctree | snapshot
parent6be32eb98e12434f7c4534e2638016f65cd1b280commit | diff
parent18d4dab538a21e6f4a478c57829cf616abfbf015commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph fixes from Sage Weil:
 "There are two critical regression fixes for CephFS from Zheng, and an
  RBD completion fix for layered images from Ilya"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: fix copyup completion race
  ceph: always re-send cap flushes when MDS recovers
  ceph: fix ceph_encode_locks_to_buffer()
Linux Kernel Source Tree.