diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-19 16:11:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-19 16:11:28 -0700 |
| commit | 85efc72a0218335324d358ac479a04c16316fd4d (patch) | |
| tree | d3299ad27ca32e7aa73e4850c8ac58aae7c97434 /net/netfilter/xt_dscp.c | |
| parent | 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44 (diff) | |
| parent | 6a3ca4f18873f950895cb64ddefafb51a732e3f7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull last minute Ceph fixes from Sage Weil:
"The important one fixes a bug in the socket failure handling behavior
that was turned up in some recent failure injection testing. The
other two are minor bug fixes."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: endian bug in rbd_req_cb()
rbd: Fix ceph_snap_context size calculation
libceph: fix messenger retry
Diffstat (limited to 'net/netfilter/xt_dscp.c')
0 files changed, 0 insertions, 0 deletions