Merge branch 'for-5.18/block' into for-next
authorJens Axboe <axboe@kernel.dk>
Mon, 28 Feb 2022 13:40:29 +0000 (06:40 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 28 Feb 2022 13:40:29 +0000 (06:40 -0700)
commite70f36e84f9b736afa9b7b5a51e6ed5ca1de1803
tree619c8e7bcf34499f6ed7adedb788308b970fc1a6
parent1f225bbebd0275056485bc2f3c955c6fe62ed06e
parent20f01f163203666010ee1560852590a0c0572726
Merge branch 'for-5.18/block' into for-next

* for-5.18/block:
  blk-crypto: show crypto capabilities in sysfs
  block: don't delete queue kobject before its children
  block: simplify calling convention of elv_unregister_queue()
block/elevator.c
include/linux/blkdev.h