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