From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Apr 2025 14:02:22 +0000 (-0700)
Subject: Merge tag 'block-6.15-20250410' of git://git.kernel.dk/linux
X-Git-Tag: v6.15-rc2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4742a89cfaced383db758bef94037637899487a;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'block-6.15-20250410' of git://git.kernel.dk/linux

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
---

e4742a89cfaced383db758bef94037637899487a