Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue