diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-12 10:56:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-12 10:56:37 -0800 |
| commit | 37d4e84f765bb3038ddfeebdc5d1cfd7e1ef688f (patch) | |
| tree | 5cae84a65aa8b83801ac4742bb4acd164d4869e2 /drivers/net/ethernet/cavium/liquidio/octeon_console.c | |
| parent | ae4b064e2a616b545acf02b8f50cc513b32c7522 (diff) | |
| parent | da08e1e1d7c3f805f8771ad6a6fd3a7a30ba4fe2 (diff) | |
Merge tag 'ceph-for-5.5-rc2' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"A fix to avoid a corner case when scheduling cap reclaim in batches
from Xiubo, a patch to add some observability into cap waiters from
Jeff and a couple of cleanups"
* tag 'ceph-for-5.5-rc2' of git://github.com/ceph/ceph-client:
ceph: add more debug info when decoding mdsmap
ceph: switch to global cap helper
ceph: trigger the reclaim work once there has enough pending caps
ceph: show tasks waiting on caps in debugfs caps file
ceph: convert int fields in ceph_mount_options to unsigned int
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/octeon_console.c')
0 files changed, 0 insertions, 0 deletions