JohnnLee 2ec8b3a5cb Merge branch 'LA.UM.9.12.C10.11.00.00.840.201' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19 ...

Conflicts:
	Documentation/devicetree/bindings~qcom
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	drivers/char/diag/diagmem.c
	drivers/dma-buf/dma-buf.c
	drivers/gpu/msm/Makefile
	drivers/gpu/msm/kgsl.c
	drivers/hid/Kconfig
	drivers/hid/hid-ids.h
	drivers/hid/hid-playstation.c
	drivers/hid/hid-quirks.c
	drivers/md/dm-default-key.c
	drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c
	drivers/power/supply/qcom/Makefile
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/scsi/ufs/ufs-qcom.c
	drivers/tty/serial/msm_geni_serial.c
	drivers/usb/gadget/function/f_fs.c
	fs/f2fs/node.c
	fs/f2fs/node.h
	fs/f2fs/recovery.c
	fs/f2fs/segment.c
	fs/incfs/data_mgmt.c
	fs/incfs/format.c
	fs/incfs/main.c
	fs/incfs/vfs.c
	include/linux/mm.h
	include/soc/qcom/memory_dump.h
	kernel/futex.c
	mm/mmap.c
	mm/mremap.c

Bug: 210578498
Signed-off-by: JohnnLee <johnnlee@google.com>
Change-Id: Ic925ed432e887337ebd6027007853cedde7fd64e

2022-03-08 15:42:12 +08:00

41 KiB

Raw Blame History

View Raw