JohnnLee
fad96b1c77
Merge branch 'LA.UM.9.12.R1.11.00.00.597.108' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt
Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
Documentation/devicetree/bindings/sound/wm8994.txt
Documentation/devicetree/bindings/usb/dwc3.txt
arch/arm64/configs/vendor/kona_defconfig
arch/arm64/mm/init.c
drivers/base/base.h
drivers/base/core.c
drivers/char/diag/diagfwd_rpmsg.c
drivers/clk/clk.c
drivers/gpu/msm/kgsl.c
drivers/hwtracing/coresight/coresight-tmc-etf.c
drivers/md/dm-default-key.c
drivers/mmc/core/block.c
drivers/mmc/core/queue.c
drivers/mmc/host/sdhci-msm.c
drivers/platform/msm/ipa/Makefile
drivers/platform/msm/ipa/ipa_api.h
drivers/platform/msm/usb_bam.c
drivers/power/supply/power_supply_sysfs.c
drivers/power/supply/qcom/qpnp-qg.c
drivers/scsi/ufs/ufs-qcom.c
drivers/scsi/ufs/ufshcd-crypto-qti.h
drivers/scsi/ufs/ufshcd.c
drivers/slimbus/qcom-ngd-ctrl.c
drivers/soc/qcom/minidump_log.c
drivers/soc/qcom/rq_stats.c
drivers/tty/serial/msm_geni_serial.c
drivers/usb/dwc3/gadget.c
fs/crypto/crypto.c
fs/crypto/keysetup_v1.c
fs/f2fs/data.c
fs/proc/task_mmu.c
fs/sdcardfs/main.c
include/crypto/ice.h
include/linux/mm.h
include/linux/power_supply.h
include/linux/sched.h
include/net/cfg80211.h
include/soc/qcom/socinfo.h
include/uapi/linux/v4l2-controls.h
kernel/sched/cpufreq_schedutil.c
kernel/sched/fair.c
kernel/signal.c
kernel/time/tick-sched.c
mm/memory.c
mm/oom_kill.c
mm/vmalloc.c
net/qrtr/qrtr.c
Bug: 182748782
Change-Id: I81b2744d0ce40a5e524c5e3aa4d505b3ed305f8e
Signed-off-by: JohnnLee <johnnlee@google.com>