Merge branch 'block-6.15' into for-6.16/block
authorJens Axboe <axboe@kernel.dk>
Mon, 5 May 2025 13:13:44 +0000 (07:13 -0600)
committerJens Axboe <axboe@kernel.dk>
Mon, 5 May 2025 13:13:44 +0000 (07:13 -0600)
commitc595b5402f403690681ff866ca29abf1ec970f53
tree0a9114627a06a8f2b20f446b7bf2c451508cc89a
parent00ef5c728ec05af5f8591016a9d138eab6b6f8e9
parent6d732e8d1e6ddc27bbdebbee48fa5825203fb4a9
Merge branch 'block-6.15' into for-6.16/block

Merge 6.15 block fixes in, once again, to resolve conflicts with the
fixes for ublk that went into mainline and the 6.16 ublk updates.

* block-6.15:
  nvmet-auth: always free derived key data
  nvmet-tcp: don't restore null sk_state_change
  nvmet-tcp: select CONFIG_TLS from CONFIG_NVME_TARGET_TCP_TLS
  nvme-tcp: select CONFIG_TLS from CONFIG_NVME_TCP_TLS
  nvme-tcp: fix premature queue removal and I/O failover
  nvme-pci: add quirks for WDC Blue SN550 15b7:5009
  nvme-pci: add quirks for device 126f:1001
  nvme-pci: fix queue unquiesce check on slot_reset
  ublk: remove the check of ublk_need_req_ref() from __ublk_check_and_get_req
  ublk: enhance check for register/unregister io buffer command
  ublk: decouple zero copy from user copy
  selftests: ublk: fix UBLK_F_NEED_GET_DATA

Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/ublk_drv.c