Merge branch '6.5/scsi-staging' into 6.5/scsi-fixes

Pull in the currently staged SCSI fixes for 6.5.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --cc block/blk-zoned.c
Simple merge

diff --cc drivers/block/virtio_blk.c
Simple merge

diff --cc drivers/scsi/aacraid/aacraid.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_def.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_init.c
Simple merge

diff --cc drivers/ufs/core/ufshcd.c
Simple merge