Lucas Wei
e7e6a26ceb
Merge LA.UM.9.12.R2.10.00.00.685.039 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
modified: arch/arm64/configs/redbull_defconfig
modified: arch/arm64/configs/vendor/kona_defconfig
modified: arch/arm64/configs/vendor/lito_defconfig
modified: arch/arm64/include/asm/traps.h
modified: arch/arm64/kernel/smp.c
modified: arch/arm64/mm/dma-mapping.c
modified: arch/arm64/mm/fault.c
modified: drivers/android/binder.c
modified: drivers/base/power/wakeup.c
modified: drivers/bus/mhi/core/mhi_main.c
modified: drivers/clk/clk.c
modified: drivers/clocksource/arm_arch_timer.c
modified: drivers/cpuidle/lpm-levels.c
modified: drivers/crypto/msm/qcedev.c
modified: drivers/devfreq/governor_memlat_trace.h
modified: drivers/dma-buf/dma-buf.c
modified: drivers/gpu/Makefile
modified: drivers/gpu/drm/drm_dp_mst_topology.c
modified: drivers/gpu/drm/drm_edid.c
modified: drivers/gpu/msm/Kconfig
modified: drivers/gpu/msm/kgsl.c
modified: drivers/gpu/msm/kgsl_sharedmem.c
modified: drivers/hwtracing/coresight/coresight-etm-perf.c
modified: drivers/hwtracing/coresight/coresight-tmc-etr.c
modified: drivers/iommu/arm-smmu.c
modified: drivers/iommu/io-pgtable-arm.c
modified: drivers/iommu/io-pgtable-fast.c
modified: drivers/iommu/io-pgtable.c
modified: drivers/iommu/iommu.c
modified: drivers/leds/leds-qpnp-flash-v2.c
modified: drivers/misc/Kconfig
modified: drivers/misc/qseecom.c
modified: drivers/mmc/core/Kconfig
modified: drivers/mmc/core/block.c
modified: drivers/mmc/host/cqhci-crypto-qti.c
modified: drivers/mmc/host/cqhci-crypto.c
modified: drivers/mmc/host/cqhci.c
modified: drivers/mmc/host/sdhci-msm.c
modified: drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
modified: drivers/net/wireless/ath/wil6210/interrupt.c
modified: drivers/net/wireless/ath/wil6210/wmi.c
modified: drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
modified: drivers/power/supply/power_supply_sysfs.c
modified: drivers/power/supply/qcom/Kconfig
modified: drivers/power/supply/qcom/Makefile
modified: drivers/power/supply/qcom/qg-core.h
modified: drivers/power/supply/qcom/qpnp-qg.c
modified: drivers/power/supply/qcom/qpnp-smb5.c
modified: drivers/power/supply/qcom/smb5-lib.c
modified: drivers/power/supply/qcom/smb5-lib.h
modified: drivers/regulator/core.c
modified: drivers/regulator/proxy-consumer.c
modified: drivers/scsi/ufs/ufs_quirks.h
modified: drivers/scsi/ufs/ufshcd.c
modified: drivers/soc/qcom/icnss.c
modified: drivers/soc/qcom/minidump_log.c
modified: drivers/soc/qcom/watchdog_v2.c
modified: drivers/spi/spi-geni-qcom.c
modified: drivers/staging/android/ion/Makefile
modified: drivers/staging/android/ion/ion.c
modified: drivers/thermal/cpu_cooling.c
modified: drivers/thermal/of-thermal.c
modified: drivers/thermal/thermal_core.c
modified: drivers/tty/serial/Kconfig
modified: drivers/tty/serial/Makefile
modified: drivers/tty/serial/msm_geni_serial.c
modified: drivers/usb/core/usb.c
modified: drivers/usb/dwc3/gadget.c
modified: drivers/usb/dwc3/gadget.h
modified: drivers/usb/gadget/composite.c
modified: drivers/usb/gadget/epautoconf.c
modified: drivers/usb/gadget/udc/core.c
modified: drivers/usb/host/xhci.c
modified: fs/crypto/crypto.c
modified: fs/crypto/keysetup.c
modified: fs/crypto/keysetup_v1.c
modified: fs/f2fs/checkpoint.c
modified: fs/f2fs/data.c
modified: fs/f2fs/f2fs.h
modified: fs/f2fs/node.c
modified: fs/incfs/Kconfig
modified: fs/incfs/data_mgmt.c
modified: fs/incfs/data_mgmt.h
modified: fs/incfs/vfs.c
modified: fs/proc/task_mmu.c
modified: include/drm/drm_connector.h
modified: include/drm/drm_dp_mst_helper.h
modified: include/linux/clk-provider.h
modified: include/linux/dma-buf.h
modified: include/linux/dma-mapping.h
modified: include/linux/fs.h
modified: include/linux/io-pgtable.h
modified: include/linux/iommu.h
modified: include/linux/mm.h
modified: include/linux/mm_types.h
modified: include/linux/mmc/host.h
modified: include/linux/mmzone.h
modified: include/linux/perf_event.h
modified: include/linux/power_supply.h
modified: include/linux/pwm.h
modified: include/linux/regulator/driver.h
modified: include/linux/rwsem.h
modified: include/linux/sched.h
modified: include/linux/sched/signal.h
modified: include/linux/sched/sysctl.h
modified: include/linux/sched/topology.h
modified: include/linux/sched/user.h
modified: include/linux/thermal.h
modified: include/linux/usb.h
modified: include/linux/usb/gadget.h
modified: include/linux/usb/hcd.h
modified: include/linux/vm_event_item.h
modified: include/net/cfg80211.h
modified: include/scsi/scsi_device.h
modified: include/soc/qcom/minidump.h
modified: include/soc/qcom/qmi_rmnet.h
modified: include/soc/qcom/socinfo.h
modified: include/trace/events/power.h
modified: include/uapi/drm/drm_mode.h
modified: include/uapi/linux/coresight-stm.h
modified: include/uapi/linux/ip.h
modified: include/uapi/linux/nl80211.h
modified: include/uapi/linux/videodev2.h
modified: kernel/dma/mapping.c
modified: kernel/dma/removed.c
modified: kernel/panic.c
modified: kernel/sched/cpupri.c
modified: kernel/sched/cpupri.h
modified: kernel/sched/fair.c
modified: kernel/sched/rt.c
modified: kernel/sched/sched.h
modified: kernel/sched/walt.h
modified: kernel/sysctl.c
modified: mm/Kconfig
modified: mm/compaction.c
modified: mm/oom_kill.c
modified: mm/page_alloc.c
modified: mm/vmalloc.c
modified: mm/vmscan.c
modified: net/qrtr/qrtr.c
modified: net/wireless/nl80211.c
modified: net/wireless/scan.c
modified: sound/core/init.c
modified: sound/soc/soc-core.c
modified: sound/usb/card.c
modified: sound/usb/pcm.c
modified: sound/usb/pcm.h
modified: sound/usb/usbaudio.h
Bug: 172988823
Bug: 173092548
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I9c86e3a0309b7078e7640788c00172c6e9b4cf67
2021-03-17 10:53:52 +08:00
..
2021-03-17 10:53:52 +08:00
2020-09-20 23:45:10 +05:30
2021-03-17 10:53:52 +08:00
2020-09-14 22:50:24 +05:30
2020-09-14 22:50:24 +05:30