diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 17:32:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 17:32:49 -0800 |
| commit | 58890c06691462ca29900d1116b28c7a3e131252 (patch) | |
| tree | 2fe512c5a664176de8078f06264da850b1460fb5 /include/uapi/rdma/rdma_user_cm.h | |
| parent | 42288fe366c4f1ce7522bc9f27d0bc2a81c55264 (diff) | |
| parent | 0fa6ebc600bc8e830551aee47a0e929e818a1868 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil:
"Two of Alex's patches deal with a race when reseting server
connections for open RBD images, one demotes some non-fatal BUGs to
WARNs, and my patch fixes a protocol feature bit failure path."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: fix protocol feature mismatch failure path
libceph: WARN, don't BUG on unexpected connection states
libceph: always reset osds when kicking
libceph: move linger requests sooner in kick_requests()
Diffstat (limited to 'include/uapi/rdma/rdma_user_cm.h')
0 files changed, 0 insertions, 0 deletions