From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Mar 2017 19:05:47 +0000 (-0800)
Subject: Merge tag 'ceph-for-4.11-rc2' of git://github.com/ceph/ceph-client
X-Git-Tag: v5.15~11695
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24c534bb161b8c95f261b34cbe44bbd043e829fc;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'ceph-for-4.11-rc2' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:

 - a fix for the recently discovered misdirected requests bug present in
   jewel and later on the server side and all stable kernels

 - a fixup for -rc1 CRUSH changes

 - two usability enhancements: osd_request_timeout option and
   supported_features bus attribute.

* tag 'ceph-for-4.11-rc2' of git://github.com/ceph/ceph-client:
  libceph: osd_request_timeout option
  rbd: supported_features bus attribute
  libceph: don't set weight to IN when OSD is destroyed
  libceph: fix crush_decode() for older maps
---

24c534bb161b8c95f261b34cbe44bbd043e829fc