diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-05 19:52:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-05 19:52:57 -0800 |
| commit | 5d6a6a75e0036a88ac17a844686e4a9ef926e493 (patch) | |
| tree | 85bcb8a1ee20d5ebfca8aa23f0fa835ce8a5f87b /drivers/staging | |
| parent | 9b108828ed25aff1239304437ec5fa8b9977a306 (diff) | |
| parent | b0b31a8ffe54abf0a455bcaee54dd92f08817164 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil:
"We have a few wire protocol compatibility fixes, ports of a few recent
CRUSH mapping changes, and a couple error path fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: MOSDOpReply v7 encoding
libceph: advertise support for TUNABLES5
crush: decode and initialize chooseleaf_stable
crush: add chooseleaf_stable tunable
crush: ensure take bucket value is valid
crush: ensure bucket id is valid before indexing buckets array
ceph: fix snap context leak in error path
ceph: checking for IS_ERR instead of NULL
Diffstat (limited to 'drivers/staging')
0 files changed, 0 insertions, 0 deletions