]> Gentwo Git Trees - linux/.git/commitdiff
Merge branch 'for-6.15/block' into for-next
authorJens Axboe <axboe@kernel.dk>
Thu, 20 Feb 2025 15:00:27 +0000 (08:00 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 20 Feb 2025 15:00:27 +0000 (08:00 -0700)
* 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


Trivial merge