Wilson Sung
518cfd97f6
Merge branch 'android-msm-sunfish-4.14' into android-msm-pixel-4.14
Conflicts:
Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt
Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl
arch/arm64/include/asm/processor.h
arch/arm64/kernel/process.c
drivers/block/zram/zram_dedup.c
drivers/char/diag/diag_masks.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/gpu/drm/msm/dsi-staging/dsi_backlight.c
drivers/gpu/drm/msm/dsi-staging/dsi_display.c
drivers/gpu/drm/msm/dsi-staging/dsi_drm.c
drivers/gpu/drm/msm/dsi-staging/dsi_panel.c
drivers/gpu/drm/msm/sde/sde_connector.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_kms.c
drivers/gpu/drm/msm/sde_power_handle.h
drivers/gpu/msm/kgsl_events.c
drivers/input/misc/lm36011/lm36011_module.c
drivers/media/platform/msm/camera/cam_icp/cam_icp_context.c
drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c
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/include/cam_ife_csid_hw_intf.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_req_mgr/cam_req_mgr_core.c
drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_core.h
drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_interface.h
drivers/media/platform/msm/camera/cam_sensor_module/Makefile
drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_core.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_dev.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_dev.h
drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_core.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_soc.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
drivers/media/platform/msm/camera/cam_sensor_module/cam_ois/cam_ois_core.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_dev.h
drivers/media/platform/msm/sde/rotator/sde_rotator_core.c
drivers/pci/host/pci-msm-msi.c
drivers/pci/host/pci-msm.c
drivers/platform/msm/gsi/gsi.c
drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
drivers/platform/msm/ipa/ipa_v3/ipa_wdi3_i.c
drivers/power/supply/google/Kconfig
drivers/power/supply/google/Makefile
drivers/power/supply/google/gbms_storage.c
drivers/power/supply/google/google_battery.c
drivers/power/supply/google/google_bms.h
drivers/power/supply/google/gvotable.c
drivers/power/supply/google/gvotable.h
drivers/power/supply/power_supply_sysfs.c
drivers/power/supply/qcom/Kconfig
drivers/power/supply/qcom/Makefile
drivers/power/supply/qcom/qpnp-smb5.c
drivers/power/supply/qcom/smb5-lib.c
drivers/power/supply/qcom/smb5-lib.h
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/qpnp-amoled-regulator.c
drivers/scsi/ufs/ufshcd.h
drivers/usb/dwc3/dwc3-msm.c
drivers/usb/gadget/function/f_accessory.c
fs/ext4/move_extent.c
fs/overlayfs/namei.c
include/linux/msm_gsi.h
include/linux/power_supply.h
include/uapi/media/cam_req_mgr.h
include/uapi/media/cam_sensor.h
kernel/sched/fair.c
mm/memory.c
Bug: 149536833
Change-Id: I3544549951f29271154814dd78877b83ffb32179
Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-03-17 14:37:12 +08:00
..
2019-12-05 15:37:22 +01:00
2019-10-25 10:33:41 +08:00