Files
Wilson Sung 312445bdbb Merge android-msm-floral-4.14-qt-qpr1 into android-msm-sunfish-4.14
Conflicts:
	Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt
	Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl
	Documentation/devicetree/bindings/regulator/qpnp-amoled-regulator.txt
	arch/arm64/Kconfig.platforms
	arch/arm64/Makefile
	arch/arm64/boot/dts/google/Makefile
	arch/arm64/boot/dts/qcom/Makefile
	build.config.common
	build.config.common.clang
	drivers/block/zram/zram_dedup.c
	drivers/char/diag/diagchar_core.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/dsi-staging/dsi_panel.h
	drivers/gpu/drm/msm/msm_atomic.c
	drivers/gpu/drm/msm/sde/sde_connector.c
	drivers/gpu/drm/msm/sde/sde_connector.h
	drivers/gpu/drm/msm/sde/sde_encoder.c
	drivers/gpu/msm/adreno_a6xx_gmu.c
	drivers/gpu/msm/kgsl_events.c
	drivers/gpu/msm/kgsl_gmu_core.c
	drivers/gpu/msm/kgsl_gmu_core.h
	drivers/input/misc/Makefile
	drivers/input/touchscreen/Kconfig
	drivers/media/platform/msm/camera/cam_isp/cam_isp_context.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/include/cam_ife_csid_hw_intf.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_csiphy/cam_csiphy_core.c
	drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
	drivers/media/platform/msm/camera/cam_utils/cam_soc_util.h
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/nfc/Kconfig
	drivers/nfc/ese/st54j_se.c
	drivers/nfc/st21nfc.c
	drivers/nfc/st21nfc.h
	drivers/pci/host/pci-msm-msi.c
	drivers/pci/host/pci-msm.c
	drivers/pinctrl/qcom/pinctrl-msm.c
	drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
	drivers/power/supply/power_supply_sysfs.c
	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/soc/qcom/modemsmem/modemsmem.c
	drivers/soc/qcom/modemsmem/modemsmem.h
	drivers/thermal/qcom/bcl_pmic5.c
	drivers/thermal/thermal_core.c
	drivers/usb/dwc3/dwc3-msm.c
	drivers/usb/gadget/function/f_accessory.c
	fs/ext4/move_extent.c
	include/linux/power_supply.h
	include/uapi/linux/st54j_se.h
	include/uapi/media/cam_req_mgr.h
	include/uapi/media/cam_sensor.h
	kernel/sched/fair.c
	mm/memory.c
	mm/swapfile.c
	net/qrtr/qrtr.c
	sound/soc/codecs/Makefile

Bug: 143327339
Bug: 143336433
Bug: 143336628
Bug: 143337282
Bug: 143337733
Bug: 143338160
Bug: 143338217
Bug: 143338266
Change-Id: I94b5116b13d2792e72928a4a65533dca14822c71
Signed-off-by: Wilson Sung <wilsonsung@google.com>
2019-11-06 16:41:53 +08:00

31 lines
664 B
Makefile

# UAPI Header export list
ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
no-export-headers += a.out.h
endif
header-y += hbtp_input.h
header-y += qbt1000.h
ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h),)
no-export-headers += kvm.h
endif
ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),)
no-export-headers += kvm_para.h
endif
header-y += mhi.h
header-y += sockev.h
header-y += nfc/
header-y += seemp_api.h
header-y += seemp_param_id.h
header-y += citadel.h
ifneq ($(VSERVICES_SUPPORT), "")
include include/linux/Kbuild.vservices
endif
header-y += okl4-link-shbuf.h
header-y += citadel.h