| commit | 7e884479bf5041fc511b06a173cdcdf41984071c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 03 11:09:07 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 03 11:09:07 2015 -0700 |
| tree | 4b29dce3dfc6924e6df0a0ca09916057ae5cc52c | |
| parent | 665aadc1d69e6f98c01194531fa558224545ce22 [diff] | |
| parent | 2761713d35e370fd640b5781109f753066b746c4 [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()