Conflicts: drivers/scsi/ufs/ufshcd.c Checked out ' 39f4ec1ef6 ', similar fix was found in source drivers/staging/android/ashmem.c drivers/usb/gadget/function/u_serial.c fs/ext4/ext4.h security/selinux/avc.c
39f4ec1ef6