diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-05 15:17:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-05 15:17:02 -0700 |
| commit | 5575eeb7b9f687ca4899e2d8721a9b17265d0060 (patch) | |
| tree | f105b068410e48f5b2d65e85802a9d4bfa3e0638 /arch/xtensa/include/asm/cacheflush.h | |
| parent | 0624bcaaf06c1fe5aca4e72287a3f13026764d36 (diff) | |
| parent | 3bd58143bafc56dbc07f4f085e4d7e018d332674 (diff) | |
| download | blackbird-obmc-linux-5575eeb7b9f687ca4899e2d8721a9b17265d0060.tar.gz blackbird-obmc-linux-5575eeb7b9f687ca4899e2d8721a9b17265d0060.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil:
"First, there is a critical fix for the new primary-affinity function
that went into -rc1.
The second batch of patches from Zheng fix a range of problems with
directory fragmentation, readdir, and a few odds and ends for cephfs"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: reserve caps for file layout/lock MDS requests
ceph: avoid releasing caps that are being used
ceph: clear directory's completeness when creating file
libceph: fix non-default values check in apply_primary_affinity()
ceph: use fpos_cmp() to compare dentry positions
ceph: check directory's completeness before emitting directory entry
Diffstat (limited to 'arch/xtensa/include/asm/cacheflush.h')
0 files changed, 0 insertions, 0 deletions
