From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Oct 2019 22:30:09 +0000 (-0400)
Subject: Merge tag 'ceph-for-5.4-rc4' of git://github.com/ceph/ceph-client
X-Git-Tag: v5.4-rc4~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6b95cf9b8bb3cb647d9f43109a9c50a234b39781;p=users%2Fhch%2Fdma-mapping.git

Merge tag 'ceph-for-5.4-rc4' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:
 "A future-proofing decoding fix from Jeff intended for stable and a
  patch for a mostly benign race from Dongsheng"

* tag 'ceph-for-5.4-rc4' of git://github.com/ceph/ceph-client:
  rbd: cancel lock_dwork if the wait is interrupted
  ceph: just skip unrecognized info in ceph_reply_info_extra
---

6b95cf9b8bb3cb647d9f43109a9c50a234b39781