scsi,block: update SCSI to handle mixed merge failures