diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-19 01:30:09 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-19 01:30:09 +0300 |
| commit | 6b95cf9b8bb3cb647d9f43109a9c50a234b39781 (patch) | |
| tree | c7e85a5d8cabe31eb6048d6a4c5cefc29edb120f /fs/xfs | |
| parent | fb8527e5c13ed70057b8dfce0764ec625ec3e400 (diff) | |
| parent | 25e6be21230d3208d687dad90b6e43419013c351 (diff) | |
| download | linux-6b95cf9b8bb3cb647d9f43109a9c50a234b39781.tar.xz | |
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
Diffstat (limited to 'fs/xfs')
0 files changed, 0 insertions, 0 deletions