Merge branch '6.9/scsi-queue' into 6.9/scsi-fixes