Merge tag '4.4-scsi-mkp' into misc