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