Conflicts: drivers/power/supply/power_supply_sysfs.c drivers/power/supply/qcom/qpnp-smb5.c drivers/power/supply/qcom/smb5-lib.h drivers/scsi/ufs/ufs.h drivers/scsi/ufs/ufshcd.c drivers/scsi/ufs/ufshcd.h drivers/tty/serial/msm_geni_serial.c fs/pstore/inode.c include/linux/msm_drm_notify.h include/linux/power_supply.h include/uapi/scsi/ufs/ufs.h Bug: 144659331 Bug: 144685052 Change-Id: I00d543204bba9d0a839611102b82ef556a60cf75 Signed-off-by: lucaswei <lucaswei@google.com>