projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 665aadc 2761713)
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)
commit7e884479bf5041fc511b06a173cdcdf41984071c
tree4b29dce3dfc6924e6df0a0ca09916057ae5cc52ctree | snapshot (tar.gz zip)
parent665aadc1d69e6f98c01194531fa558224545ce22commit | diff
parent2761713d35e370fd640b5781109f753066b746c4commit | diff
Merge branch 'for-linus' of git://git./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()