kernel_google_msm-4.14

Evolution-X-Devices/kernel_google_msm-4.14

Files

changyan 4ae1dea82a Merge branch 'LA.UM.9.1.C11.11.00.00.841.184' via branch 'qcom-msm-4.14' into android-msm-pixel-4.14

Conflicts:
	arch/arm/configs/vendor/trinket-perf_defconfig
	arch/arm/configs/vendor/trinket_defconfig
	arch/arm64/configs/floral_defconfig
	arch/arm64/configs/sunfish_defconfig
	arch/arm64/configs/vendor/atoll-perf_defconfig
	arch/arm64/configs/vendor/atoll_defconfig
	arch/arm64/configs/vendor/gen3auto-capture_defconfig
	arch/arm64/configs/vendor/gen3auto-perf_defconfig
	arch/arm64/configs/vendor/gen3auto_defconfig
	arch/arm64/configs/vendor/qcs610-minimal-perf_defconfig
	arch/arm64/configs/vendor/sa8155-perf_defconfig
	arch/arm64/configs/vendor/sa8155_defconfig
	arch/arm64/configs/vendor/sdm660-perf_defconfig
	arch/arm64/configs/vendor/sdm660_defconfig
	arch/arm64/configs/vendor/sdmshrike_defconfig
	arch/arm64/configs/vendor/sdmsteppe-auto-perf_defconfig
	arch/arm64/configs/vendor/sdmsteppe-auto_defconfig
	arch/arm64/configs/vendor/sdmsteppe-perf_defconfig
	arch/arm64/configs/vendor/sdmsteppe_defconfig
	arch/arm64/configs/vendor/sm8150-perf_defconfig
	arch/arm64/configs/vendor/sm8150_defconfig
	arch/arm64/configs/vendor/trinket-perf_defconfig
	arch/arm64/configs/vendor/trinket_defconfig
	drivers/char/adsprpc.c
	drivers/char/adsprpc_compat.c
	drivers/char/adsprpc_shared.h
	drivers/gpu/drm/msm/msm_drv.c
	drivers/gpu/msm/kgsl.c
	drivers/hid/Makefile
	drivers/hid/hid-playstation.c
	drivers/hwtracing/coresight/coresight-tmc-etr.c
	drivers/hwtracing/coresight/coresight-tmc.h
	drivers/md/dm-default-key.c
	drivers/media/platform/msm/ais/cam_cdm/cam_cdm_core_common.c
	drivers/media/platform/msm/ais/cam_req_mgr/cam_mem_mgr.c
	drivers/media/platform/msm/camera/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c
	drivers/media/platform/msm/npu/npu_mgr.c
	drivers/media/platform/msm/npu_v2/npu_mgr.c
	drivers/media/platform/msm/npu_v2/npu_mgr.h
	drivers/media/platform/msm/vidc/msm_venc.c
	drivers/media/platform/msm/vidc/msm_vidc_clocks.c
	drivers/media/platform/msm/vidc/msm_vidc_common.c
	drivers/slimbus/slim-msm-ngd.c
	drivers/slimbus/slim-msm.h
	drivers/soc/qcom/crypto-qti-common.c
	drivers/tty/serial/msm_geni_serial.c
	fs/incfs/data_mgmt.c
	fs/incfs/format.c
	fs/incfs/main.c
	fs/incfs/vfs.c

Bug: 212195199
Signed-off-by: changyan <changyan@google.com>
Change-Id: Idf6b02430f643a803437391930f0b93f1ddb6027

2022-03-17 02:14:01 +00:00

amdgpu_drm.h

drm/amdgpu: Fix the exported always on CU bitmap

2017-06-29 12:43:49 -04:00

armada_drm.h

License cleanup: add SPDX license identifier to uapi header files with a license

2017-11-02 11:20:11 +01:00

drm_fourcc.h

drm/msm: Add snapshot of SDE and supporting drivers

2017-10-30 16:27:51 -04:00

drm_mode.h

drm/fb-helper: Move out modeset config code