]> www.infradead.org Git - users/hch/misc.git/commitdiff
Merge tag 'block-6.15-20250410' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Apr 2025 14:02:22 +0000 (07:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Apr 2025 14:02:22 +0000 (07:02 -0700)
Pull block fixes from Jens Axboe:

 - Add a missing ublk selftest script, from test additions added last
   week

 - Two fixes for ublk error recovery and reissue

 - Cleanup of ublk argument passing

* tag 'block-6.15-20250410' of git://git.kernel.dk/linux:
  ublk: pass ublksrv_ctrl_cmd * instead of io_uring_cmd *
  ublk: don't fail request for recovery & reissue in case of ubq->canceling
  ublk: fix handling recovery & reissue in ublk_abort_queue()
  selftests: ublk: fix test_stripe_04


Trivial merge