tree d3299ad27ca32e7aa73e4850c8ac58aae7c97434
parent 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44
parent 6a3ca4f18873f950895cb64ddefafb51a732e3f7
author Linus Torvalds <torvalds@linux-foundation.org> 1342739488 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1342739488 -0700

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