This series backports some blk-crypto fixes to 5.10. Eric Biggers (3): blk-mq: release crypto keyslot before reporting I/O complete blk-crypto: make blk_crypto_evict_key() return void blk-crypto: make blk_crypto_evict_key() more robust block/blk-core.c | 7 ++++ block/blk-crypto-internal.h | 25 +++++++++++--- block/blk-crypto.c | 69 +++++++++++++++++++++---------------- block/blk-merge.c | 2 ++ block/blk-mq.c | 2 +- block/keyslot-manager.c | 43 +++++++++++------------ include/linux/blk-crypto.h | 4 +-- 7 files changed, 94 insertions(+), 58 deletions(-) base-commit: f1b32fda06d2cfb8eea9680b0ba7a8b0d5b81eeb -- 2.40.1