projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb8527e 25e6be2)
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)
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


Trivial merge
Domain: System / Kernel;