diff options
| author | Linus Torvalds | 2013-06-12 08:28:19 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2013-06-12 08:28:19 -0700 |
| commit | 8d7a8fe2ce2f242953aef46226eaa8a4a1a2c380 (patch) | |
| tree | 310f88f97aa3192a95fd13423efd93bd5ec57c0e /kernel | |
| parent | 77293e215edef7871a39de4b326f777bc39278ca (diff) | |
| parent | 3abef3b3585bbc67d56fdc9c67761a900fb4b69d (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 is a pair of fixes for double-frees in the recent bundle for
3.10, a couple of fixes for long-standing bugs (sleep while atomic and
an endianness fix), and a locking fix that can be triggered when osds
are going down"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: fix cleanup in rbd_add()
rbd: don't destroy ceph_opts in rbd_add()
ceph: ceph_pagelist_append might sleep while atomic
ceph: add cpu_to_le32() calls when encoding a reconnect capability
libceph: must hold mutex for reset_changed_osds()
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions