Conflicts: drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c drivers/scsi/ufs/ufshcd.c drivers/tty/serial/msm_geni_serial.c Bug: 156322859 Change-Id: I0ea6a5a28ff3c1b4b8d4c4d16eb375d987b1d352 Signed-off-by: Wilson Sung <wilsonsung@google.com>
Conflicts: drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c drivers/scsi/ufs/ufshcd.c drivers/tty/serial/msm_geni_serial.c Bug: 156322859 Change-Id: I0ea6a5a28ff3c1b4b8d4c4d16eb375d987b1d352 Signed-off-by: Wilson Sung <wilsonsung@google.com>