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