drivers/scsi: Merge s3ve3g changes