This series adds sysfs files that expose the inline encryption capabilities of request queues. Patches 1 and 2 are some related cleanups for existing blk-sysfs code. Patch 3 is the real change; see there for more details. This applies to linux-block/for-next. Eric Biggers (3): block: simplify calling convention of elv_unregister_queue() block: don't delete queue kobject before its children blk-crypto: show crypto capabilities in sysfs Documentation/block/queue-sysfs.rst | 30 +++++ block/Makefile | 3 +- block/blk-crypto-internal.h | 12 ++ block/blk-crypto-sysfs.c | 177 ++++++++++++++++++++++++++++ block/blk-crypto.c | 3 + block/blk-sysfs.c | 17 ++- block/elevator.c | 8 +- include/linux/blkdev.h | 1 + 8 files changed, 241 insertions(+), 10 deletions(-) create mode 100644 block/blk-crypto-sysfs.c base-commit: 4d162e24e9979dcb3d7825229982c172ca4bde54 -- 2.34.1