Merge remote-tracking branch 'mkp-scsi/fixes' into fixes