]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c1653ea 20aae82)
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)
commitb218f72b8614b9c309e8d1bc42d7e0224eb4dc9f
tree4b29dce3dfc6924e6df0a0ca09916057ae5cc52ctree | snapshot
parentc1653ea8ea96e69fcf5400050f24bd7de7b11e8ecommit | diff
parent20aae82fd0d3e8e5be9db02cd24c969caf7b3222commit | 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.