Merge tag 'ceph-for-5.4-rc4' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Oct 2019 22:30:09 +0000 (18:30 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Oct 2019 22:30:09 +0000 (18:30 -0400)
commit6b95cf9b8bb3cb647d9f43109a9c50a234b39781
treec7e85a5d8cabe31eb6048d6a4c5cefc29edb120f
parentfb8527e5c13ed70057b8dfce0764ec625ec3e400
parent25e6be21230d3208d687dad90b6e43419013c351
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