lucaswei
5a6769f45c
Merge 'branch LA.UM.8.13.R1.08.00.00.571.037' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
arch/arm64/configs/vendor/kona_defconfig
build.config.common
drivers/input/touchscreen/Makefile
drivers/hwtracing/coresight/coresight.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/power/supply/qcom/qg-core.h
drivers/power/supply/qcom/qpnp-qg.c
drivers/regulator/qpnp-amoled-regulator.c
drivers/scsi/ufs/ufs-debugfs.c
drivers/scsi/ufs/ufshcd.c
drivers/scsi/ufs/ufshcd.h
drivers/soc/qcom/Kconfig
drivers/soc/qcom/Makefile
drivers/thermal/thermal_core.c
drivers/usb/phy/phy-msm-ssusb-qmp.c
fs/f2fs/super.c
Bug: 146397409
Bug: 146529583
Change-Id: I0e973573b350b77222f18ca2a9cb06f18975d943
Signed-off-by: lucaswei <lucaswei@google.com>