kernel_google_msm-4.14

Evolution-X-Devices/kernel_google_msm-4.14

Files

Wilson Sung 24fb9f2e95 Merge branch 'LA.UM.9.1.R1.10.00.00.604.021' via branch 'qcom-msm-4.14' into android-msm-floral-4.14

Conflicts:
	Documentation/devicetree/bindings/arm/msm/msm.txt
	Documentation/devicetree/bindings/bus/mhi.txt
	Documentation/devicetree/bindings/power/supply/qcom/qpnp-qg.txt
	Documentation/devicetree/bindings/regulator/qpnp-amoled-regulator.txt
	arch/arm/configs/vendor/sa515m-perf_defconfig
	arch/arm/configs/vendor/sa515m_defconfig
	arch/arm/configs/vendor/sdxprairie-perf_defconfig
	arch/arm/configs/vendor/sdxprairie_defconfig
	arch/arm/kernel/smp.c
	arch/arm64/boot/dts/google/sm8150-coral-battery-evt.dtsi
	arch/arm64/boot/dts/google/sm8150-flame-battery-evt.dtsi
	arch/arm64/boot/dts/google/sm8150-flame-notouch.dtsi
	arch/arm64/boot/dts/qcom/Makefile
	arch/arm64/boot/dts/qcom/atoll-ab-atp-overlay.dts
	arch/arm64/boot/dts/qcom/atoll-atp.dtsi
	arch/arm64/boot/dts/qcom/atoll-idp.dtsi
	arch/arm64/boot/dts/qcom/atoll-lpi.dtsi
	arch/arm64/boot/dts/qcom/atoll-npu.dtsi
	arch/arm64/boot/dts/qcom/atoll-pinctrl.dtsi
	arch/arm64/boot/dts/qcom/atoll-qrd.dtsi
	arch/arm64/boot/dts/qcom/atoll-sde-display.dtsi
	arch/arm64/boot/dts/qcom/atoll.dtsi
	arch/arm64/boot/dts/qcom/atollp.dtsi
	arch/arm64/boot/dts/qcom/dm-verity-boot.dtsi
	arch/arm64/boot/dts/qcom/qcs405-iot-sku13.dts
	arch/arm64/boot/dts/qcom/qcs405-pcie.dtsi
	arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi
	arch/arm64/boot/dts/qcom/qcs405.dtsi
	arch/arm64/boot/dts/qcom/qcs407-iot-sku13.dts
	arch/arm64/boot/dts/qcom/sa515m-ccard-pcie-ep.dts
	arch/arm64/boot/dts/qcom/sa515m-flashless.dtsi
	arch/arm64/boot/dts/qcom/sdxprairie-blsp.dtsi
	arch/arm64/boot/dts/qcom/sdxprairie-cdp-v1.1-cpe.dts
	arch/arm64/boot/dts/qcom/sdxprairie-cdp-v1.1-cpe.dtsi
	arch/arm64/boot/dts/qcom/sdxprairie-cpe-memory-map.dtsi
	arch/arm64/boot/dts/qcom/sdxprairie-mtp-le-cpe.dtsi
	arch/arm64/boot/dts/qcom/sdxprairie-v2-mtp-le-cpe.dtsi
	arch/arm64/boot/dts/qcom/sdxprairie-v2-mtp-v1.1-cpe.dtsi
	arch/arm64/boot/dts/qcom/sdxprairie.dtsi
	arch/arm64/boot/dts/qcom/sm8150-mhi.dtsi
	arch/arm64/boot/dts/qcom/sm8150-sdxprairie.dtsi
	arch/arm64/include/asm/cpucaps.h
	arch/arm64/include/asm/pgtable.h
	arch/arm64/include/asm/ptrace.h
	arch/arm64/include/asm/sysreg.h
	arch/arm64/kernel/cpu_errata.c
	arch/arm64/kernel/cpufeature.c
	arch/arm64/kernel/ssbd.c
	build.config.cuttlefish.aarch64
	build.config.cuttlefish.x86_64
	drivers/base/dd.c
	drivers/bus/mhi/controllers/mhi_qcom.h
	drivers/bus/mhi/core/mhi_init.c
	drivers/bus/mhi/core/mhi_internal.h
	drivers/bus/mhi/core/mhi_main.c
	drivers/bus/mhi/core/mhi_pm.c
	drivers/char/adsprpc.c
	drivers/char/diag/diag_dci.c
	drivers/char/diag/diag_memorydevice.c
	drivers/char/diag/diag_memorydevice.h
	drivers/char/diag/diag_mux.c
	drivers/char/diag/diag_mux.h
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagfwd.c
	drivers/char/diag/diagfwd_bridge.c
	drivers/char/diag/diagfwd_rpmsg.c
	drivers/clk/qcom/clk-alpha-pll.c
	drivers/cpufreq/cpufreq_stats.c
	drivers/cpuidle/lpm-levels.c
	drivers/crypto/msm/ice.c
	drivers/gpu/drm/msm/dsi-staging/dsi_drm.c
	drivers/gpu/drm/msm/dsi-staging/dsi_panel.c
	drivers/gpu/drm/msm/msm_drv.c
	drivers/gpu/drm/msm/sde/sde_connector.h
	drivers/gpu/drm/msm/sde/sde_crtc.c
	drivers/gpu/drm/msm/sde/sde_encoder.c
	drivers/gpu/drm/msm/sde/sde_hw_catalog.c
	drivers/gpu/drm/msm/sde/sde_hw_catalog.h
	drivers/gpu/drm/msm/sde/sde_kms.c
	drivers/gpu/drm/msm/sde_power_handle.h
	drivers/gpu/drm/msm/sde_rsc.c
	drivers/gpu/drm/msm/shd/shd_drm.c
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_iommu.c
	drivers/hwtracing/coresight/coresight-tmc-etr.c
	drivers/input/Makefile
	drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.c
	drivers/iommu/arm-smmu.c
	drivers/leds/leds-qpnp-flash-v2.c
	drivers/md/dm-ioctrl.h
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.h
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe175_130.h
	drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_soc.c
	drivers/media/platform/msm/npu/npu_debugfs.c
	drivers/media/platform/msm/npu_v2/Kconfig
	drivers/media/platform/msm/npu_v2/npu_common.h
	drivers/media/platform/msm/npu_v2/npu_dbg.c
	drivers/media/platform/msm/npu_v2/npu_debugfs.c
	drivers/media/platform/msm/npu_v2/npu_dev.c
	drivers/media/platform/msm/npu_v2/npu_firmware.h
	drivers/media/platform/msm/npu_v2/npu_host_ipc.c
	drivers/media/platform/msm/npu_v2/npu_host_ipc.h
	drivers/media/platform/msm/npu_v2/npu_hw.h
	drivers/media/platform/msm/npu_v2/npu_hw_access.c
	drivers/media/platform/msm/npu_v2/npu_hw_access.h
	drivers/media/platform/msm/npu_v2/npu_mgr.c
	drivers/media/platform/msm/npu_v2/npu_mgr.h
	drivers/media/platform/msm/sde/rotator/sde_rotator_core.c
	drivers/mmc/core/sdio.c
	drivers/mmc/core/sdio_irq.c
	drivers/mmc/host/sdhci.c
	drivers/net/ethernet/aquantia/atlantic-fwd/atl_of.h
	drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
	drivers/net/ethernet/qualcomm/rmnet/rmnet_descriptor.c
	drivers/net/ethernet/stmicro/stmmac/Makefile
	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.h
	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-gpio.c
	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-pps.c
	drivers/net/ethernet/stmicro/stmmac/stmmac.h
	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
	drivers/pci/host/pci-msm-msi.c
	drivers/pci/host/pci-msm.c
	drivers/pinctrl/qcom/pinctrl-qcs405.c
	drivers/platform/msm/ep_pcie/ep_pcie_core.c
	drivers/platform/msm/gsi/gsi.c
	drivers/platform/msm/ipa/ipa_api.c
	drivers/platform/msm/ipa/ipa_api.h
	drivers/platform/msm/ipa/ipa_common_i.h
	drivers/platform/msm/ipa/ipa_v3/ethernet/ipa_eth.c
	drivers/platform/msm/ipa/ipa_v3/ethernet/ipa_eth_ep.c
	drivers/platform/msm/ipa/ipa_v3/ethernet/ipa_eth_i.h
	drivers/platform/msm/ipa/ipa_v3/ethernet/ipa_eth_uc.c
	drivers/platform/msm/ipa/ipa_v3/ipa.c
	drivers/platform/msm/ipa/ipa_v3/ipa_client.c
	drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
	drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
	drivers/platform/msm/ipa/ipa_v3/ipa_i.h
	drivers/platform/msm/ipa/ipa_v3/ipa_mhi.c
	drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
	drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
	drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
	drivers/platform/msm/ipa/ipa_v3/ipa_wdi3_i.c
	drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c
	drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
	drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h
	drivers/platform/msm/ipa/ipa_v3/teth_bridge.c
	drivers/platform/msm/mhi_dev/mhi.c
	drivers/platform/msm/mhi_dev/mhi_uci.c
	drivers/platform/msm/qcom-geni-se.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/power/supply/qcom/battery.c
	drivers/power/supply/qcom/battery.h
	drivers/power/supply/qcom/qg-battery-profile.c
	drivers/power/supply/qcom/qg-core.h
	drivers/power/supply/qcom/qg-reg.h
	drivers/power/supply/qcom/qg-soc.c
	drivers/power/supply/qcom/qpnp-fg-gen4.c
	drivers/power/supply/qcom/qpnp-qg.c
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/power/supply/qcom/smb1390-charger-psy.c
	drivers/power/supply/qcom/smb5-lib.c
	drivers/power/supply/qcom/smb5-lib.h
	drivers/power/supply/qcom/smb5-reg.h
	drivers/regulator/qpnp-amoled-regulator.c
	drivers/scsi/ufs/ufs.h
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h
	drivers/soc/qcom/Makefile
	drivers/soc/qcom/dcc_v2.c
	drivers/soc/qcom/dfc_defs.h
	drivers/soc/qcom/dfc_qmap.c
	drivers/soc/qcom/dfc_qmi.c
	drivers/soc/qcom/glink_probe.c
	drivers/soc/qcom/msm_bus/msm_bus_core.h
	drivers/soc/qcom/peripheral-loader.c
	drivers/soc/qcom/qmi_rmnet.c
	drivers/soc/qcom/qmi_rmnet_i.h
	drivers/soc/qcom/socinfo.c
	drivers/spi/spi-geni-qcom.c
	drivers/staging/android/ion/msm/msm_ion_of.c
	drivers/usb/dwc3/dwc3-msm.c
	fs/ext4/inode.c
	fs/ext4/move_extent.c
	fs/ext4/page-io.c
	fs/f2fs/data.c
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/inode.c
	fs/f2fs/segment.c
	fs/f2fs/super.c
	fs/overlayfs/namei.c
	fs/userfaultfd.c
	include/linux/cpuhotplug.h
	include/linux/mhi.h
	include/linux/power_supply.h
	include/linux/usb/phy.h
	include/soc/qcom/rmnet_qmi.h
	include/soc/qcom/socinfo.h
	include/trace/events/dfc.h
	include/uapi/linux/msm_ipa.h
	include/uapi/scsi/ufs/ufs.h
	include/uapi/sound/compress_params.h
	kernel/cpu.c
	kernel/sched/fair.c
	mm/memory.c
	net/qrtr/qrtr.c
	security/pfe/pfk.c
	sound/core/compress_offload.c
  Roll back:
  	fs/f2fs
	fs/ext4
Bug: 149660093

Change-Id: I87c4319d8529dc12120ed73ade97b24174be289f
Signed-off-by: Wilson Sung <wilsonsung@google.com>

2020-03-20 11:46:28 +08:00

Kconfig

pfk: Added support for virtualized ICE

2019-12-02 13:50:58 -08:00

Makefile

pfk: Added support for virtualized ICE

2019-12-02 13:50:58 -08:00

pfk_ext4.c

block: fix wrong dun size when merging IOs

2019-07-15 14:10:16 +00:00

pfk_ext4.h

block: fix wrong dun size when merging IOs