Merge "UAPI: scsi: move the scsi ioctl related files" into msm-4.9