From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 20 Feb 2025 15:00:27 +0000 (-0700)
Subject: Merge branch 'for-6.15/block' into for-next
X-Git-Tag: next-20250221~77^2~3
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=e8978f60f882d0d776dfbb6a3b52d605ce241f07;p=linux%2F.git

Merge branch 'for-6.15/block' into for-next

* for-6.15/block:
  Revert "driver: block: release the lo_work_lock before queue_work"
  block: refactor rq_qos_wait()
  block: introduce init_wait_func()
  loop: release the lo_work_lock before queue_work
  blk-crypto: add ioctls to create and prepare hardware-wrapped keys
  blk-crypto: show supported key types in sysfs
  blk-crypto: add basic hardware-wrapped key support
---

e8978f60f882d0d776dfbb6a3b52d605ce241f07