-

HEAD detached at f28a8ca
You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

	modified:   AndroidKernel.mk
	modified:   Documentation/DMA-attributes.txt
	modified:   Documentation/devicetree/bindings/arm/msm/cpr-regulator.txt
	new file:   Documentation/devicetree/bindings/arm/msm/ext-buck-control.txt
	modified:   Documentation/devicetree/bindings/arm/msm/lpm-levels.txt
	modified:   Documentation/devicetree/bindings/arm/msm/msm_bus.txt
	modified:   Documentation/devicetree/bindings/arm/msm/msm_thermal.txt
	modified:   Documentation/devicetree/bindings/arm/msm/pm-8x60.txt
	modified:   Documentation/devicetree/bindings/arm/msm/rpm-regulator-smd.txt
	modified:   Documentation/devicetree/bindings/crypto/msm/qcedev.txt
	modified:   Documentation/devicetree/bindings/crypto/msm/qcrypto.txt
	modified:   Documentation/devicetree/bindings/fb/mdss-dsi-ctrl.txt
	modified:   Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt
	modified:   Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt
	modified:   Documentation/devicetree/bindings/gpu/adreno.txt
	modified:   Documentation/devicetree/bindings/hwmon/qpnp-adc-current.txt
	modified:   Documentation/devicetree/bindings/hwmon/qpnp-adc-voltage.txt
	modified:   Documentation/devicetree/bindings/i2c/i2c-qup.txt
	new file:   Documentation/devicetree/bindings/input/misc/hbtp_input.txt
	modified:   Documentation/devicetree/bindings/input/misc/mma8x5x.txt
	modified:   Documentation/devicetree/bindings/input/touchscreen/gt9xx/gt9xx.txt
	modified:   Documentation/devicetree/bindings/leds/leds-qpnp.txt
	modified:   Documentation/devicetree/bindings/media/video/msm-cci.txt
	modified:   Documentation/devicetree/bindings/media/video/msm-eeprom.txt
	modified:   Documentation/devicetree/bindings/memory.txt
	modified:   Documentation/devicetree/bindings/mmc/sdhci-msm.txt
	modified:   Documentation/devicetree/bindings/mtd/msm_qpic_nand.txt
	modified:   Documentation/devicetree/bindings/nfc/nfc-nci.txt
	new file:   Documentation/devicetree/bindings/platform/msm/avtimer.txt
	modified:   Documentation/devicetree/bindings/platform/msm/qpnp-power-on.txt
	modified:   Documentation/devicetree/bindings/power/qpnp-charger.txt
	new file:   Documentation/devicetree/bindings/power/smb358-charger.txt
	modified:   Documentation/devicetree/bindings/qseecom/qseecom.txt
	new file:   Documentation/devicetree/bindings/regulator/fan53555.txt
	modified:   Documentation/devicetree/bindings/regulator/krait-regulator.txt
	new file:   Documentation/devicetree/bindings/regulator/mem-acc-regulator.txt
	new file:   Documentation/devicetree/bindings/regulator/onsemi-ncp6335d.txt
	modified:   Documentation/devicetree/bindings/slimbus/slim-msm-ctrl.txt
	modified:   Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
	new file:   Documentation/devicetree/bindings/sound/voice-svc.txt
	modified:   Documentation/devicetree/bindings/spi/spi_qsd.txt
	modified:   Documentation/devicetree/bindings/thermal/qpnp-adc-tm.txt
	modified:   Documentation/devicetree/bindings/tty/serial/msm_serial_hs.txt
	new file:   Documentation/devicetree/bindings/usb/ice40-hcd.txt
	modified:   Documentation/devicetree/bindings/usb/msm-ehci-hsic.txt
	modified:   Documentation/devicetree/bindings/usb/msm-hsusb.txt
	modified:   Documentation/devicetree/bindings/usb/msm-ssusb.txt
	modified:   Documentation/devicetree/bindings/vendor-prefixes.txt
	modified:   Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt
	new file:   Documentation/usb/ice40-hcd.txt
	new file:   Documentation/usb/uicc.txt
	modified:   Documentation/vm/ksm.txt
	modified:   arch/arm/Kconfig.debug
	modified:   arch/arm/boot/dts/apq8074-dragonboard.dtsi
	modified:   arch/arm/boot/dts/apq8074-v1.dtsi
	modified:   arch/arm/boot/dts/apq8074-v2.0-1.dtsi
	modified:   arch/arm/boot/dts/apq8074-v2.2.dtsi
	new file:   arch/arm/boot/dts/apq8084-camera-sensor-cdp.dtsi
	new file:   arch/arm/boot/dts/apq8084-camera-sensor-mtp.dtsi
	modified:   arch/arm/boot/dts/apq8084-mdss.dtsi
	modified:   arch/arm/boot/dts/dsi-panel-generic-720p-cmd.dtsi
	modified:   arch/arm/boot/dts/dsi-panel-hx8394a-720p-video.dtsi
	modified:   arch/arm/boot/dts/dsi-panel-jdi-1080p-video.dtsi
	new file:   arch/arm/boot/dts/dsi-panel-jdi-720p-cmd.dtsi
	new file:   arch/arm/boot/dts/dsi-panel-jdi-dualmipi0-cmd.dtsi
	new file:   arch/arm/boot/dts/dsi-panel-jdi-dualmipi0-video.dtsi
	new file:   arch/arm/boot/dts/dsi-panel-jdi-dualmipi1-cmd.dtsi
	new file:   arch/arm/boot/dts/dsi-panel-jdi-dualmipi1-video.dtsi
	modified:   arch/arm/boot/dts/dsi-panel-nt35590-720p-cmd.dtsi
	modified:   arch/arm/boot/dts/dsi-panel-nt35590-720p-video.dtsi
	modified:   arch/arm/boot/dts/dsi-panel-ssd2080m-720p-video.dtsi
	modified:   arch/arm/boot/dts/dsi-panel-truly-wvga-video.dtsi
	modified:   arch/arm/boot/dts/msm-pm8110.dtsi
	modified:   arch/arm/boot/dts/msm-pma8084.dtsi
	modified:   arch/arm/boot/dts/msm8226-1080p-cdp.dtsi
	modified:   arch/arm/boot/dts/msm8226-1080p-mtp.dtsi
	modified:   arch/arm/boot/dts/msm8226-720p-cdp.dtsi
	modified:   arch/arm/boot/dts/msm8226-bus.dtsi
	modified:   arch/arm/boot/dts/msm8226-camera-sensor-cdp.dtsi
	modified:   arch/arm/boot/dts/msm8226-camera-sensor-mtp.dtsi
	modified:   arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi
	modified:   arch/arm/boot/dts/msm8226-gpu.dtsi
	modified:   arch/arm/boot/dts/msm8226-qrd-skuf.dtsi
	modified:   arch/arm/boot/dts/msm8226-v1-pm.dtsi
	modified:   arch/arm/boot/dts/msm8226-v1-qrd-dvt.dts
	modified:   arch/arm/boot/dts/msm8226-v1-qrd-evt.dts
	modified:   arch/arm/boot/dts/msm8226-v1-qrd-skuf-pvt.dts
	modified:   arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts
	modified:   arch/arm/boot/dts/msm8226-v1.dtsi
	modified:   arch/arm/boot/dts/msm8226-v2-1080p-cdp.dts
	modified:   arch/arm/boot/dts/msm8226-v2-pm.dtsi
	modified:   arch/arm/boot/dts/msm8226-v2-qrd-dvt.dts
	modified:   arch/arm/boot/dts/msm8226-v2-qrd-evt.dts
	modified:   arch/arm/boot/dts/msm8226-v2-qrd-pvt.dts
	modified:   arch/arm/boot/dts/msm8226-v2-qrd-skuf-pvt.dts
	modified:   arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts
	modified:   arch/arm/boot/dts/msm8610-bus.dtsi
	modified:   arch/arm/boot/dts/msm8610-camera-sensor-cdp-mtp.dtsi
	modified:   arch/arm/boot/dts/msm8610-cdp.dtsi
	modified:   arch/arm/boot/dts/msm8610-gpu.dtsi
	modified:   arch/arm/boot/dts/msm8610-mdss.dtsi
	modified:   arch/arm/boot/dts/msm8610-mtp.dtsi
	modified:   arch/arm/boot/dts/msm8610-qrd-skuaa.dtsi
	modified:   arch/arm/boot/dts/msm8610-qrd-skuab.dtsi
	modified:   arch/arm/boot/dts/msm8610-regulator.dtsi
	modified:   arch/arm/boot/dts/msm8610-v1-pm.dtsi
	modified:   arch/arm/boot/dts/msm8610-v1.dtsi
	modified:   arch/arm/boot/dts/msm8610-v2-mtp.dts
	modified:   arch/arm/boot/dts/msm8610-v2-pm.dtsi
	modified:   arch/arm/boot/dts/msm8610-v2.dtsi
	modified:   arch/arm/boot/dts/msm8610.dtsi
	modified:   arch/arm/boot/dts/msm8612-qrd-camera-sensor.dtsi
	modified:   arch/arm/boot/dts/msm8926-camera-sensor-qrd.dtsi
	modified:   arch/arm/boot/dts/msm8926-qrd-skug.dtsi
	renamed:    arch/arm/boot/dts/msm8926-1080p-cdp.dts -> arch/arm/boot/dts/msm8926-v1-1080p-cdp.dts
	renamed:    arch/arm/boot/dts/msm8926-1080p-mtp.dts -> arch/arm/boot/dts/msm8926-v1-1080p-mtp.dts
	renamed:    arch/arm/boot/dts/msm8926-720p-cdp.dts -> arch/arm/boot/dts/msm8926-v1-720p-cdp.dts
	renamed:    arch/arm/boot/dts/msm8926-720p-mtp.dts -> arch/arm/boot/dts/msm8926-v1-720p-mtp.dts
	renamed:    arch/arm/boot/dts/msm8926-qrd-skug-pvt.dts -> arch/arm/boot/dts/msm8926-v1-qrd-skug-pvt.dts
	renamed:    arch/arm/boot/dts/msm8926-qrd-skug.dts -> arch/arm/boot/dts/msm8926-v1-qrd-skug.dts
	renamed:    arch/arm/boot/dts/msm8926-qrd.dts -> arch/arm/boot/dts/msm8926-v1-qrd.dts
	new file:   arch/arm/boot/dts/msm8926-v1.dtsi
	new file:   arch/arm/boot/dts/msm8926-v2-1080p-cdp.dts
	new file:   arch/arm/boot/dts/msm8926-v2-1080p-ext-buck-cdp.dts
	new file:   arch/arm/boot/dts/msm8926-v2-1080p-ext-buck-mtp.dts
	new file:   arch/arm/boot/dts/msm8926-v2-1080p-mtp.dts
	new file:   arch/arm/boot/dts/msm8926-v2-720p-cdp.dts
	new file:   arch/arm/boot/dts/msm8926-v2-720p-mtp.dts
	new file:   arch/arm/boot/dts/msm8926-v2-ext-buck.dtsi
	new file:   arch/arm/boot/dts/msm8926-v2-qrd-skug-pvt.dts
	new file:   arch/arm/boot/dts/msm8926-v2-qrd-skug.dts
	new file:   arch/arm/boot/dts/msm8926-v2-qrd.dts
	new file:   arch/arm/boot/dts/msm8926-v2.dtsi
	modified:   arch/arm/boot/dts/msm8974-camera-sensor-dragonboard.dtsi
	modified:   arch/arm/boot/dts/msm8974-camera-sensor-fluid.dtsi
	modified:   arch/arm/boot/dts/msm8974-cdp.dtsi
	modified:   arch/arm/boot/dts/msm8974-fluid.dtsi
	modified:   arch/arm/boot/dts/msm8974-liquid.dtsi
	modified:   arch/arm/boot/dts/msm8974-mdss-panels.dtsi
	modified:   arch/arm/boot/dts/msm8974-mdss.dtsi
	modified:   arch/arm/boot/dts/msm8974-mtp.dtsi
	modified:   arch/arm/boot/dts/msm8974-regulator.dtsi
	modified:   arch/arm/boot/dts/msm8974-v1-pm.dtsi
	modified:   arch/arm/boot/dts/msm8974-v1.dtsi
	modified:   arch/arm/boot/dts/msm8974-v2-pm.dtsi
	modified:   arch/arm/boot/dts/msm8974-v2.2.dtsi
	modified:   arch/arm/boot/dts/msm8974-v2.dtsi
	new file:   arch/arm/boot/dts/msm8974pro-ab-pm8941-fluid-hbtp.dts
	modified:   arch/arm/boot/dts/msm8974pro-ab-pm8941.dtsi
	modified:   arch/arm/boot/dts/msm8974pro-ac-pm8941-mtp.dts
	modified:   arch/arm/boot/dts/msm8974pro-ac-pma8084-pm8941-mtp.dts
	modified:   arch/arm/boot/dts/msm8974pro-ac-pma8084-pm8941.dtsi
	modified:   arch/arm/boot/dts/msm8974pro-pm.dtsi
	modified:   arch/arm/boot/dts/msm8974pro-pma8084-mtp.dtsi
	modified:   arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi
	modified:   arch/arm/boot/dts/msm8974pro-pma8084.dtsi
	modified:   arch/arm/boot/dts/msm9625-pm.dtsi
	new file:   arch/arm/boot/dts/msmsamarium-camera-sensor-cdp-interposer.dtsi
	new file:   arch/arm/boot/dts/msmsamarium-camera-sensor-cdp.dtsi
	modified:   arch/arm/common/cpaccess.c
	modified:   arch/arm/configs/apq8084_defconfig
	modified:   arch/arm/configs/msm8610-perf_defconfig
	modified:   arch/arm/configs/msm8610_defconfig
	modified:   arch/arm/configs/msm8974-perf_defconfig
	modified:   arch/arm/configs/msm8974_defconfig
	modified:   arch/arm/configs/msm9625_defconfig
	modified:   arch/arm/include/asm/cacheflush.h
	modified:   arch/arm/include/asm/pmu.h
	modified:   arch/arm/include/asm/system_misc.h
	modified:   arch/arm/include/asm/thread_info.h
	modified:   arch/arm/kernel/perf_event.c
	modified:   arch/arm/kernel/perf_event_msm_krait.c
	modified:   arch/arm/kernel/perf_event_v7.c
	modified:   arch/arm/kernel/process.c
	modified:   arch/arm/kernel/ptrace.c
	modified:   arch/arm/kernel/setup.c
	modified:   arch/arm/kernel/signal.c
	modified:   arch/arm/kernel/traps.c
	modified:   arch/arm/mach-msm/Makefile.boot
	modified:   arch/arm/mach-msm/batterydata-lib.c
	modified:   arch/arm/mach-msm/board-8226.c
	modified:   arch/arm/mach-msm/board-8610.c
	modified:   arch/arm/mach-msm/board-8974.c
	modified:   arch/arm/mach-msm/clock-8226.c
	modified:   arch/arm/mach-msm/clock-local2.h
	new file:   arch/arm/mach-msm/clock-samarium.c
	new file:   arch/arm/mach-msm/common_log.c
	modified:   arch/arm/mach-msm/dfe-fsm9xxx.c
	new file:   arch/arm/mach-msm/ext-buck-control.c
	modified:   arch/arm/mach-msm/gpiomux.c
	modified:   arch/arm/mach-msm/include/mach/ecm_ipa.h
	modified:   arch/arm/mach-msm/include/mach/gpiomux.h
	modified:   arch/arm/mach-msm/include/mach/iommu.h
	modified:   arch/arm/mach-msm/include/mach/iommu_hw-v1.h
	modified:   arch/arm/mach-msm/include/mach/kgsl.h
	modified:   arch/arm/mach-msm/include/mach/msm-krait-l2-accessors.h
	modified:   arch/arm/mach-msm/include/mach/msm_bus.h
	modified:   arch/arm/mach-msm/include/mach/msm_bus_board.h
	modified:   arch/arm/mach-msm/include/mach/msm_memory_dump.h
	modified:   arch/arm/mach-msm/include/mach/msm_qmi_interface.h
	modified:   arch/arm/mach-msm/include/mach/msm_serial_hs.h
	modified:   arch/arm/mach-msm/include/mach/msm_smem.h
	modified:   arch/arm/mach-msm/include/mach/msm_spi.h
	modified:   arch/arm/mach-msm/include/mach/ocmem_priv.h
	modified:   arch/arm/mach-msm/include/mach/qcrypto.h
	modified:   arch/arm/mach-msm/include/mach/qdsp6v2/apr.h
	modified:   arch/arm/mach-msm/include/mach/qdsp6v2/apr_us.h
	modified:   arch/arm/mach-msm/include/mach/qdsp6v2/usf.h
	modified:   arch/arm/mach-msm/include/mach/qseecomi.h
	modified:   arch/arm/mach-msm/include/mach/remote_spinlock.h
	modified:   arch/arm/mach-msm/include/mach/socinfo.h
	modified:   arch/arm/mach-msm/include/mach/subsystem_notif.h
	modified:   arch/arm/mach-msm/include/mach/usbdiag.h
	modified:   arch/arm/mach-msm/lpm_levels.c
	modified:   arch/arm/mach-msm/mpm-of.c
	modified:   arch/arm/mach-msm/msm-buspm-dev.h
	modified:   arch/arm/mach-msm/msm-krait-l2-accessors.c
	modified:   arch/arm/mach-msm/msm_bus/msm_bus_arb.c
	modified:   arch/arm/mach-msm/msm_bus/msm_bus_bimc.c
	modified:   arch/arm/mach-msm/msm_bus/msm_bus_core.h
	modified:   arch/arm/mach-msm/msm_bus/msm_bus_fabric.c
	modified:   arch/arm/mach-msm/msm_bus/msm_bus_noc.c
	modified:   arch/arm/mach-msm/msm_bus/msm_bus_noc.h
	modified:   arch/arm/mach-msm/msm_bus/msm_bus_of.c
	modified:   arch/arm/mach-msm/msm_qmi_interface.c
	modified:   arch/arm/mach-msm/msm_watchdog_v2.c
	modified:   arch/arm/mach-msm/ocmem_core.c
	modified:   arch/arm/mach-msm/ocmem_rdm.c
	modified:   arch/arm/mach-msm/ocmem_sched.c
	modified:   arch/arm/mach-msm/perf_debug.c
	modified:   arch/arm/mach-msm/perf_event_msm_krait_l2.c
	modified:   arch/arm/mach-msm/perf_trace_counters.c
	modified:   arch/arm/mach-msm/perf_trace_counters.h
	modified:   arch/arm/mach-msm/peripheral-loader.c
	modified:   arch/arm/mach-msm/pil-pronto.c
	modified:   arch/arm/mach-msm/pm-boot.c
	modified:   arch/arm/mach-msm/pm-stats.c
	modified:   arch/arm/mach-msm/qdsp6v2/Makefile
	modified:   arch/arm/mach-msm/qdsp6v2/apr.c
	modified:   arch/arm/mach-msm/qdsp6v2/apr_tal.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_aac.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_amrnb.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_amrwb.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_amrwbplus.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_evrc.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_mp3.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_multi_aac.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_qcelp.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_utils.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_wma.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_wmapro.c
	modified:   arch/arm/mach-msm/qdsp6v2/msm_audio_ion.c
	modified:   arch/arm/mach-msm/qdsp6v2/ultrasound/q6usm.h
	modified:   arch/arm/mach-msm/qdsp6v2/ultrasound/usf.c
	modified:   arch/arm/mach-msm/qdsp6v2/ultrasound/version_b/q6usm_b.c
	new file:   arch/arm/mach-msm/qdsp6v2/voice_svc.c
	modified:   arch/arm/mach-msm/remote_spinlock.c
	deleted:    arch/arm/mach-msm/rmt_storage_client.c
	modified:   arch/arm/mach-msm/rpm-regulator-smd.c
	modified:   arch/arm/mach-msm/rpm_log.c
	modified:   arch/arm/mach-msm/rpm_rbcpr_stats_v2.c
	modified:   arch/arm/mach-msm/smd.c
	modified:   arch/arm/mach-msm/smem.c
	modified:   arch/arm/mach-msm/smp2p.c
	modified:   arch/arm/mach-msm/smp2p_private.h
	modified:   arch/arm/mach-msm/socinfo.c
	modified:   arch/arm/mm/dma-mapping.c
	modified:   arch/arm/mm/fault.c
	modified:   arch/arm/mm/mmu.c
	modified:   block/blk-merge.c
	modified:   drivers/bluetooth/bluetooth-power.c
	modified:   drivers/bluetooth/hci_ath.c
	modified:   drivers/char/adsprpc.c
	modified:   drivers/char/diag/diag_debugfs.c
	modified:   drivers/char/diag/diagchar_hdlc.c
	modified:   drivers/char/diag/diagfwd_cntl.c
	modified:   drivers/char/diag/diagfwd_cntl.h
	modified:   drivers/char/diag/diagfwd_sdio.c
	modified:   drivers/char/diag/diagmem.c
	modified:   drivers/char/hw_random/Kconfig
	modified:   drivers/char/hw_random/Makefile
	new file:   drivers/char/hw_random/ctr_drbg.c
	new file:   drivers/char/hw_random/ctr_drbg.h
	new file:   drivers/char/hw_random/fips_drbg.c
	new file:   drivers/char/hw_random/fips_drbg.h
	new file:   drivers/char/hw_random/msm_fips_selftest.c
	new file:   drivers/char/hw_random/msm_fips_selftest.h
	modified:   drivers/char/hw_random/msm_rng.c
	new file:   drivers/char/hw_random/msm_rng.h
	modified:   drivers/coresight/coresight-event.c
	modified:   drivers/coresight/coresight-tmc.c
	modified:   drivers/cpufreq/cpu-boost.c
	modified:   drivers/crypto/Kconfig
	modified:   drivers/crypto/msm/Makefile
	modified:   drivers/crypto/msm/qce.c
	modified:   drivers/crypto/msm/qce.h
	modified:   drivers/crypto/msm/qce50.c
	modified:   drivers/crypto/msm/qcedev.c
	new file:   drivers/crypto/msm/qcedev_fips.c
	new file:   drivers/crypto/msm/qcedev_fips.h
	new file:   drivers/crypto/msm/qcedevi.h
	new file:   drivers/crypto/msm/qcrypto_fips.c
	new file:   drivers/crypto/msm/qcrypto_fips.h
	new file:   drivers/crypto/msm/qcryptoi.h
	modified:   drivers/devfreq/governor_performance.c
	modified:   drivers/devfreq/governor_simpleondemand.c
	modified:   drivers/gpu/ion/ion_cma_secure_heap.c
	modified:   drivers/gpu/ion/ion_priv.h
	modified:   drivers/gpu/msm/adreno.h
	modified:   drivers/gpu/msm/adreno_coresight.c
	modified:   drivers/gpu/msm/adreno_postmortem.c
	modified:   drivers/gpu/msm/adreno_profile.c
	modified:   drivers/gpu/msm/adreno_profile.h
	modified:   drivers/gpu/msm/adreno_snapshot.c
	modified:   drivers/gpu/msm/kgsl_cffdump.c
	modified:   drivers/gpu/msm/kgsl_events.c
	modified:   drivers/gpu/msm/kgsl_log.h
	modified:   drivers/gpu/msm/kgsl_mmu.c
	modified:   drivers/gpu/msm/kgsl_snapshot.c
	modified:   drivers/gpu/msm/z180.c
	modified:   drivers/gud/Makefile
	new file:   drivers/gud/MobiCoreDriver/Makefile
	renamed:    drivers/gud/mobicore_driver/api.c -> drivers/gud/MobiCoreDriver/api.c
	renamed:    drivers/gud/mobicore_driver/arm.h -> drivers/gud/MobiCoreDriver/arm.h
	new file:   drivers/gud/MobiCoreDriver/build.sh
	renamed:    drivers/gud/mobicore_driver/debug.h -> drivers/gud/MobiCoreDriver/debug.h
	renamed:    drivers/gud/mobicore_driver/fastcall.h -> drivers/gud/MobiCoreDriver/fastcall.h
	renamed:    drivers/gud/mobicore_driver/logging.c -> drivers/gud/MobiCoreDriver/logging.c
	renamed:    drivers/gud/mobicore_driver/logging.h -> drivers/gud/MobiCoreDriver/logging.h
	renamed:    drivers/gud/mobicore_driver/main.h -> drivers/gud/MobiCoreDriver/main.h
	new file:   drivers/gud/MobiCoreDriver/mem.c
	new file:   drivers/gud/MobiCoreDriver/mem.h
	renamed:    drivers/gud/mobicore_driver/ops.c -> drivers/gud/MobiCoreDriver/ops.c
	renamed:    drivers/gud/mobicore_driver/ops.h -> drivers/gud/MobiCoreDriver/ops.h
	renamed:    drivers/gud/mobicore_driver/platforms/msm8960_surf_std/platform.h -> drivers/gud/MobiCoreDriver/platforms/MSM8960_SURF_STD/platform.h
	renamed:    drivers/gud/mobicore_driver/pm.c -> drivers/gud/MobiCoreDriver/pm.c
	renamed:    drivers/gud/mobicore_driver/pm.h -> drivers/gud/MobiCoreDriver/pm.h
	renamed:    drivers/gud/mobicore_driver/public/mc_kernel_api.h -> drivers/gud/MobiCoreDriver/public/mc_kernel_api.h
	renamed:    drivers/gud/mobicore_driver/public/mc_linux.h -> drivers/gud/MobiCoreDriver/public/mc_linux.h
	renamed:    drivers/gud/mobicore_driver/public/version.h -> drivers/gud/MobiCoreDriver/public/version.h
	new file:   drivers/gud/MobiCoreKernelApi/Makefile
	new file:   drivers/gud/MobiCoreKernelApi/build.sh
	renamed:    drivers/gud/mobicore_kernelapi/clientlib.c -> drivers/gud/MobiCoreKernelApi/clientlib.c
	renamed:    drivers/gud/mobicore_kernelapi/common.h -> drivers/gud/MobiCoreKernelApi/common.h
	renamed:    drivers/gud/mobicore_kernelapi/connection.c -> drivers/gud/MobiCoreKernelApi/connection.c
	renamed:    drivers/gud/mobicore_kernelapi/connection.h -> drivers/gud/MobiCoreKernelApi/connection.h
	renamed:    drivers/gud/mobicore_kernelapi/device.c -> drivers/gud/MobiCoreKernelApi/device.c
	renamed:    drivers/gud/mobicore_kernelapi/device.h -> drivers/gud/MobiCoreKernelApi/device.h
	renamed:    drivers/gud/mobicore_kernelapi/include/mcinq.h -> drivers/gud/MobiCoreKernelApi/include/mcinq.h
	renamed:    drivers/gud/mobicore_kernelapi/include/mcuuid.h -> drivers/gud/MobiCoreKernelApi/include/mcuuid.h
	renamed:    drivers/gud/mobicore_kernelapi/main.c -> drivers/gud/MobiCoreKernelApi/main.c
	renamed:    drivers/gud/mobicore_kernelapi/public/mobicore_driver_api.h -> drivers/gud/MobiCoreKernelApi/public/mobicore_driver_api.h
	renamed:    drivers/gud/mobicore_kernelapi/public/mobicore_driver_cmd.h -> drivers/gud/MobiCoreKernelApi/public/mobicore_driver_cmd.h
	renamed:    drivers/gud/mobicore_kernelapi/session.c -> drivers/gud/MobiCoreKernelApi/session.c
	renamed:    drivers/gud/mobicore_kernelapi/session.h -> drivers/gud/MobiCoreKernelApi/session.h
	renamed:    drivers/gud/mobicore_kernelapi/wsm.h -> drivers/gud/MobiCoreKernelApi/wsm.h
	renamed:    drivers/gud/mobicore_driver/build_tag.h -> drivers/gud/build_tag.h
	deleted:    drivers/gud/mobicore_driver/main.c
	deleted:    drivers/gud/mobicore_driver/mem.c
	deleted:    drivers/gud/mobicore_driver/mem.h
	new file:   drivers/gud/setupDrivers.sh
	modified:   drivers/hwmon/qpnp-adc-current.c
	modified:   drivers/hwmon/qpnp-adc-voltage.c
	modified:   drivers/input/misc/Kconfig
	modified:   drivers/input/misc/Makefile
	modified:   drivers/input/misc/cm36283.c
	new file:   drivers/input/misc/hbtp_input.c
	modified:   drivers/input/misc/mma8x5x.c
	modified:   drivers/input/misc/mpu3050.c
	modified:   drivers/input/touchscreen/Kconfig
	modified:   drivers/input/touchscreen/atmel_mxt_ts.c
	modified:   drivers/input/touchscreen/ft5x06_ts.c
	modified:   drivers/input/touchscreen/gt9xx/goodix_tool.c
	modified:   drivers/input/touchscreen/gt9xx/gt9xx.c
	modified:   drivers/input/touchscreen/gt9xx/gt9xx.h
	modified:   drivers/input/touchscreen/gt9xx/gt9xx_update.c
	modified:   drivers/input/touchscreen/synaptics_fw_update.c
	modified:   drivers/input/touchscreen/synaptics_i2c_rmi4.c
	modified:   drivers/input/touchscreen/synaptics_rmi_dev.c
	modified:   drivers/iommu/Kconfig
	modified:   drivers/iommu/msm_iommu_dev-v1.c
	modified:   drivers/iommu/msm_iommu_sec.c
	modified:   drivers/md/Kconfig
	modified:   drivers/md/Makefile
	new file:   drivers/md/dm-req-crypt.c
	modified:   drivers/md/dm.c
	modified:   drivers/media/dvb/dvb-core/dmxdev.c
	modified:   drivers/media/platform/msm/camera_v2/isp/msm_isp.c
	modified:   drivers/media/platform/msm/camera_v2/ispif/msm_ispif.h
	modified:   drivers/media/platform/msm/camera_v2/ispif/msm_ispif_hwreg_v1.h
	modified:   drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c
	modified:   drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c
	modified:   drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c
	modified:   drivers/media/platform/msm/camera_v2/msm.h
	modified:   drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c
	modified:   drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c
	modified:   drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.h
	modified:   drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
	modified:   drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.h
	modified:   drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
	modified:   drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h
	modified:   drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.h
	modified:   drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.c
	modified:   drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.h
	modified:   drivers/media/platform/msm/camera_v2/sensor/gc0339.c
	modified:   drivers/media/platform/msm/camera_v2/sensor/hi256.c
	modified:   drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c
	modified:   drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.h
	modified:   drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_i2c.h
	modified:   drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c
	new file:   drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
	new file:   drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.h
	new file:   drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c
	new file:   drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.h
	modified:   drivers/media/platform/msm/camera_v2/sensor/mt9m114.c
	modified:   drivers/media/platform/msm/camera_v2/sensor/sp1628.c
	modified:   drivers/media/platform/msm/dvb/demux/mpq_sdmx.c
	modified:   drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
	modified:   drivers/media/platform/msm/vidc/msm_vidc_common.h
	modified:   drivers/media/platform/msm/vidc/msm_vidc_debug.c
	modified:   drivers/media/platform/msm/vidc/msm_vidc_debug.h
	modified:   drivers/media/platform/msm/vidc/q6_hfi.c
	modified:   drivers/media/platform/msm/vidc/venus_hfi.h
	modified:   drivers/media/platform/msm/vidc/vidc_hfi.c
	modified:   drivers/media/platform/msm/wfd/enc-venus-subdev.c
	modified:   drivers/media/platform/msm/wfd/mdp-5-subdev.c
	modified:   drivers/media/platform/msm/wfd/vsg-subdev.c
	modified:   drivers/media/platform/msm/wfd/vsg-subdev.h
	modified:   drivers/media/video/mem2mem_testdev.c
	modified:   drivers/media/video/saa7134/saa7134-ts.c
	modified:   drivers/media/video/saa7134/saa7134-vbi.c
	modified:   drivers/media/video/saa7134/saa7134-video.c
	modified:   drivers/media/video/v4l2-ioctl.c
	modified:   drivers/media/video/videobuf2-core.c
	modified:   drivers/mfd/wcd9xxx-core-resource.c
	modified:   drivers/mfd/wcd9xxx-core.c
	modified:   drivers/mfd/wcd9xxx-slimslave.c
	modified:   drivers/misc/isa1200.c
	modified:   drivers/misc/qfp_fuse.c
	modified:   drivers/misc/smsc_hub.c
	modified:   drivers/misc/tspp.c
	modified:   drivers/mmc/card/queue.h
	modified:   drivers/mmc/core/bus.c
	modified:   drivers/mmc/core/cd-gpio.c
	modified:   drivers/mmc/core/quirks.c
	modified:   drivers/mmc/core/sdio_irq.c
	modified:   drivers/mmc/host/sdhci.h
	modified:   drivers/mtd/devices/msm_qpic_nand.c
	modified:   drivers/mtd/ubi/build.c
	modified:   drivers/mtd/ubi/wl.c
	modified:   drivers/net/ethernet/msm/ecm_ipa.c
	modified:   drivers/net/ethernet/msm/msm_rmnet_bam.c
	modified:   drivers/net/usb/rmnet_usb_ctrl.c
	modified:   drivers/net/usb/rmnet_usb_data.c
	modified:   drivers/net/wireless/wcnss/wcnss_vreg.c
	modified:   drivers/nfc/nfc-nci.c
	modified:   drivers/nfc/nfc-nci.h
	modified:   drivers/platform/msm/Kconfig
	modified:   drivers/platform/msm/Makefile
	modified:   drivers/platform/msm/avtimer.c
	modified:   drivers/platform/msm/ipa/ipa.c
	modified:   drivers/platform/msm/ipa/ipa_intf.c
	modified:   drivers/platform/msm/ipa/ipa_nat.c
	modified:   drivers/platform/msm/ipa/teth_bridge.c
	new file:   drivers/platform/msm/pft.c
	modified:   drivers/platform/msm/sps/sps.c
	modified:   drivers/platform/msm/sps/sps_bam.c
	modified:   drivers/platform/msm/sps/sps_bam.h
	modified:   drivers/platform/msm/sps/sps_rm.c
	modified:   drivers/power/Kconfig
	modified:   drivers/power/Makefile
	modified:   drivers/power/power_supply_core.c
	modified:   drivers/power/power_supply_sysfs.c
	new file:   drivers/power/smb358-charger.c
	modified:   drivers/regulator/Kconfig
	modified:   drivers/regulator/Makefile
	modified:   drivers/regulator/core.c
	new file:   drivers/regulator/fan53555.c
	new file:   drivers/regulator/mem-acc-regulator.c
	modified:   drivers/regulator/onsemi-ncp6335d.c
	modified:   drivers/rtc/alarm-dev.c
	modified:   drivers/scsi/scsi_scan.c
	modified:   drivers/scsi/scsi_sysfs.c
	modified:   drivers/scsi/sd.c
	modified:   drivers/scsi/ufs/ufshcd.c
	modified:   drivers/slimbus/slim-msm-ctrl.c
	modified:   drivers/slimbus/slim-msm.h
	modified:   drivers/slimbus/slimbus.c
	modified:   drivers/spi/spi_qsd.c
	modified:   drivers/spi/spi_qsd.h
	modified:   drivers/spmi/spmi.c
	modified:   drivers/target/target_core_rd.c
	modified:   drivers/thermal/thermal_sys.c
	modified:   drivers/tty/n_tty.c
	modified:   drivers/tty/serial/msm_serial_hs.c
	modified:   drivers/tty/serial/msm_serial_hs_hwreg.h
	modified:   drivers/uio/uio.c
	modified:   drivers/usb/Makefile
	modified:   drivers/usb/class/Kconfig
	modified:   drivers/usb/class/Makefile
	new file:   drivers/usb/class/ccid_bridge.c
	modified:   drivers/usb/core/hub.c
	modified:   drivers/usb/dwc3/debug.h
	modified:   drivers/usb/dwc3/debugfs.c
	modified:   drivers/usb/dwc3/ep0.c
	modified:   drivers/usb/gadget/ci13xxx_msm.c
	modified:   drivers/usb/gadget/composite.c
	modified:   drivers/usb/gadget/f_audio_source.c
	modified:   drivers/usb/gadget/f_mbim.c
	modified:   drivers/usb/gadget/f_qc_rndis.c
	modified:   drivers/usb/gadget/f_qdss.c
	modified:   drivers/usb/gadget/u_bam.c
	modified:   drivers/usb/host/Kconfig
	modified:   drivers/usb/host/Makefile
	modified:   drivers/usb/host/ehci-msm-hsic.c
	modified:   drivers/usb/host/ehci-msm2.c
	new file:   drivers/usb/host/ice40-hcd.c
	modified:   drivers/usb/host/xhci-plat.c
	modified:   drivers/usb/host/xhci-ring.c
	modified:   drivers/usb/host/xhci.c
	modified:   drivers/usb/misc/mdm_ctrl_bridge.c
	modified:   drivers/usb/storage/scsiglue.c
	modified:   drivers/usb/storage/usb.c
	modified:   drivers/usb/storage/usb.h
	modified:   drivers/video/au1100fb.c
	modified:   drivers/video/au1200fb.c
	modified:   drivers/video/msm/mdss/dsi_host_v2.h
	new file:   drivers/video/msm/mdss/dsi_status_6g.c
	modified:   drivers/video/msm/mdss/dsi_status_v2.c
	modified:   drivers/video/msm/mdss/mdp3.h
	modified:   drivers/video/msm/mdss/mdp3_ctrl.c
	modified:   drivers/video/msm/mdss/mdp3_ctrl.h
	modified:   drivers/video/msm/mdss/mdp3_dma.c
	modified:   drivers/video/msm/mdss/mdp3_ppp.h
	modified:   drivers/video/msm/mdss/mdp3_ppp_data.c
	modified:   drivers/video/msm/mdss/mdp3_ppp_hwio.c
	new file:   drivers/video/msm/mdss/mdss_debug_xlog.c
	modified:   drivers/video/msm/mdss/mdss_dsi_cmd.h
	modified:   drivers/video/msm/mdss/mdss_edp.h
	modified:   drivers/video/msm/mdss/mdss_edp_aux.c
	modified:   drivers/video/msm/mdss/mdss_hdmi_cec.c
	modified:   drivers/video/msm/mdss/mdss_hdmi_edid.c
	modified:   drivers/video/msm/mdss/mdss_hdmi_tx.h
	modified:   drivers/video/msm/mdss/mdss_hdmi_util.c
	modified:   drivers/video/msm/mdss/mdss_mdp_formats.h
	modified:   drivers/video/msm/mdss/mdss_mdp_hwio.h
	new file:   drivers/video/msm/mdss/mdss_mdp_splash_logo.c
	new file:   drivers/video/msm/mdss/mdss_mdp_splash_logo.h
	new file:   drivers/video/msm/mdss/mdss_mdp_trace.h
	modified:   drivers/video/msm/mdss/mdss_mdp_wb.c
	modified:   drivers/video/msm/mdss/mdss_qpic.c
	modified:   drivers/video/msm/mdss/mhl_sii8334.c
	new file:   drivers/video/msm/mdss/splash.h
	modified:   drivers/video/msm/vidc/common/dec/vdec.c
	modified:   drivers/video/msm/vidc/common/enc/venc.c
	modified:   fs/bio.c
	modified:   fs/direct-io.c
	modified:   fs/ext4/super.c
	modified:   fs/fat/fat.h
	modified:   fs/fuse/file.c
	modified:   fs/namei.c
	modified:   fs/open.c
	modified:   fs/proc/consoles.c
	modified:   fs/proc/nommu.c
	modified:   fs/proc/task_nommu.c
	modified:   fs/seq_file.c
	modified:   include/linux/android_alarm.h
	modified:   include/linux/batterydata-lib.h
	modified:   include/linux/blk_types.h
	modified:   include/linux/devfreq.h
	modified:   include/linux/device-mapper.h
	modified:   include/linux/dma-attrs.h
	modified:   include/linux/dma-contiguous.h
	modified:   include/linux/fib_rules.h
	new file:   include/linux/fips_status.h
	modified:   include/linux/fs.h
	new file:   include/linux/hbtp_input.h
	new file:   include/linux/i2c/i2c-qup.h
	modified:   include/linux/iopoll.h
	modified:   include/linux/ktime.h
	modified:   include/linux/mfd/wcd9xxx/core-resource.h
	modified:   include/linux/mfd/wcd9xxx/core.h
	modified:   include/linux/mfd/wcd9xxx/wcd9xxx-slimslave.h
	modified:   include/linux/mhl_8334.h
	modified:   include/linux/mmc/host.h
	modified:   include/linux/mmc/mmc.h
	new file:   include/linux/msm_hdmi.h
	modified:   include/linux/msm_ipa.h
	new file:   include/linux/msm_pft.h
	modified:   include/linux/msm_vidc_dec.h
	modified:   include/linux/netlink.h
	modified:   include/linux/nl80211.h
	modified:   include/linux/perf_event.h
	new file:   include/linux/pft.h
	modified:   include/linux/power_supply.h
	modified:   include/linux/qcedev.h
	modified:   include/linux/qpnp-revid.h
	modified:   include/linux/qpnp/power-on.h
	modified:   include/linux/qpnp/qpnp-adc.h
	modified:   include/linux/qseecom.h
	modified:   include/linux/rcupdate.h
	modified:   include/linux/rcutiny.h
	modified:   include/linux/rcutree.h
	modified:   include/linux/regulator/cpr-regulator.h
	new file:   include/linux/regulator/fan53555.h
	modified:   include/linux/regulator/onsemi-ncp6335d.h
	modified:   include/linux/remote_spinlock.h
	modified:   include/linux/rtnetlink.h
	modified:   include/linux/security.h
	modified:   include/linux/seq_file.h
	modified:   include/linux/slimbus/slimbus.h
	modified:   include/linux/smsc_hub.h
	new file:   include/linux/sockev.h
	modified:   include/linux/spi/spi.h
	modified:   include/linux/spmi.h
	modified:   include/linux/tick.h
	modified:   include/linux/usb/Kbuild
	new file:   include/linux/usb/ccid_bridge.h
	modified:   include/linux/usb/hcd.h
	modified:   include/linux/usb/msm_ext_chg.h
	modified:   include/linux/wcnss_wlan.h
	modified:   include/media/msm/vidc_init.h
	modified:   include/media/msm_media_info.h
	modified:   include/media/msmb_camera.h
	modified:   include/media/msmb_isp.h
	modified:   include/media/msmb_pproc.h
	modified:   include/media/videobuf2-core.h
	modified:   include/net/cfg80211.h
	modified:   include/net/fib_rules.h
	modified:   include/net/flow.h
	modified:   include/net/ip.h
	modified:   include/net/netlink.h
	modified:   include/net/route.h
	modified:   include/net/sock.h
	modified:   include/scsi/scsi_device.h
	modified:   include/sound/jack.h
	modified:   include/sound/q6lsm.h
	new file:   include/sound/voice_svc.h
	modified:   include/trace/events/exception.h
	new file:   include/trace/events/ice40.h
	modified:   include/trace/events/rcu.h
	modified:   kernel/cgroup.c
	modified:   kernel/cpu.c
	modified:   kernel/events/hw_breakpoint.c
	modified:   kernel/ksysfs.c
	modified:   kernel/rcu.h
	modified:   kernel/rcupdate.c
	modified:   kernel/rcutiny_plugin.h
	modified:   kernel/rcutree.h
	modified:   kernel/rcutree_plugin.h
	modified:   kernel/rcutree_trace.c
	modified:   kernel/sched/core.c
	modified:   kernel/time/alarmtimer.c
	modified:   kernel/time/tick-sched.c
	modified:   kernel/timer.c
	modified:   lib/Kconfig
	modified:   lib/genalloc.c
	modified:   lib/scatterlist.c
	modified:   lib/vsprintf.c
	modified:   mm/compaction.c
	modified:   mm/debug-pagealloc.c
	modified:   mm/page-writeback.c
	modified:   net/Kconfig
	modified:   net/core/Makefile
	modified:   net/core/ethtool.c
	modified:   net/core/fib_rules.c
	modified:   net/core/pktgen.c
	new file:   net/core/sockev_nlmcast.c
	modified:   net/ipv4/fib_frontend.c
	modified:   net/ipv4/inet_connection_sock.c
	modified:   net/ipv4/ip_output.c
	modified:   net/ipv4/netfilter/arp_tables.c
	modified:   net/ipv4/netfilter/ip_tables.c
	modified:   net/ipv4/raw.c
	modified:   net/ipv4/route.c
	modified:   net/ipv4/syncookies.c
	modified:   net/ipv4/tcp_ipv4.c
	modified:   net/ipv4/tcp_timer.c
	modified:   net/ipv4/udp.c
	modified:   net/ipv4/xfrm4_policy.c
	modified:   net/ipv6/af_inet6.c
	modified:   net/ipv6/datagram.c
	modified:   net/ipv6/inet6_connection_sock.c
	modified:   net/ipv6/netfilter/ip6_tables.c
	modified:   net/ipv6/raw.c
	modified:   net/ipv6/route.c
	modified:   net/ipv6/syncookies.c
	modified:   net/ipv6/tcp_ipv6.c
	modified:   net/ipv6/udp.c
	modified:   net/mac80211/cfg.c
	modified:   net/mac80211/wme.c
	modified:   net/netfilter/x_tables.c
	modified:   net/netlink/af_netlink.c
	modified:   net/phonet/socket.c
	modified:   net/sctp/objcnt.c
	modified:   net/wireless/core.h
	modified:   net/wireless/ibss.c
	modified:   net/wireless/mesh.c
	modified:   net/wireless/nl80211.c
	modified:   net/wireless/reg.c
	modified:   net/wireless/scan.c
	modified:   net/wireless/util.c
	modified:   net/wireless/wext-core.c
	modified:   net/x25/af_x25.c
	modified:   net/x25/x25_link.c
	modified:   net/x25/x25_route.c
	modified:   scripts/gcc-wrapper.py
	modified:   security/security.c
	modified:   security/selinux/include/objsec.h
	deleted:    sound/compress_offload/core.c
	modified:   sound/core/jack.c
	modified:   sound/soc/codecs/wcd9304.c
	modified:   sound/soc/codecs/wcd9310.c
	modified:   sound/soc/codecs/wcd9xxx-mbhc.h
	modified:   sound/soc/codecs/wcd9xxx-resmgr.c
	modified:   sound/soc/codecs/wcd9xxx-resmgr.h
	modified:   sound/soc/msm/apq8074.c
	modified:   sound/soc/msm/msm-compr-q6.c
	modified:   sound/soc/msm/msm8974.c
	modified:   sound/soc/msm/qdsp6v2/audio_acdb.c
	modified:   sound/soc/msm/qdsp6v2/audio_ocmem.c
	modified:   sound/soc/msm/qdsp6v2/msm-dolby-dap-config.c
	modified:   sound/soc/msm/qdsp6v2/msm-dolby-dap-config.h
	modified:   sound/soc/msm/qdsp6v2/msm-lsm-client.c
	modified:   sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
	modified:   sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h
	modified:   sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c
	modified:   sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.h
	modified:   sound/soc/msm/qdsp6v2/msm-pcm-voip-v2.c
	modified:   sound/soc/msm/qdsp6v2/q6afe.c
	modified:   sound/soc/msm/qdsp6v2/q6lsm.c

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	both modified:      Documentation/devicetree/bindings/fb/mdss-mdp.txt
	both modified:      arch/arm/boot/dts/dsi-panel-truly-wvga-cmd.dtsi
	both modified:      arch/arm/boot/dts/msm-pm8226.dtsi
	both modified:      arch/arm/boot/dts/msm-pm8941.dtsi
	both modified:      arch/arm/boot/dts/msm8226-720p-mtp.dtsi
	both modified:      arch/arm/boot/dts/msm8226-mdss.dtsi
	both modified:      arch/arm/boot/dts/msm8226-qrd.dtsi
	both modified:      arch/arm/boot/dts/msm8226-regulator.dtsi
	both modified:      arch/arm/boot/dts/msm8226-v2-720p-cdp.dts
	both modified:      arch/arm/boot/dts/msm8226-v2.dtsi
	both modified:      arch/arm/boot/dts/msm8226.dtsi
	both modified:      arch/arm/boot/dts/msm8926.dtsi
	both modified:      arch/arm/boot/dts/msm8974-bus.dtsi
	both modified:      arch/arm/boot/dts/msm8974-camera-sensor-cdp.dtsi
	both modified:      arch/arm/boot/dts/msm8974-camera-sensor-liquid.dtsi
	both modified:      arch/arm/boot/dts/msm8974-camera-sensor-mtp.dtsi
	both modified:      arch/arm/boot/dts/msm8974.dtsi
	both modified:      arch/arm/boot/dts/msm8974pro-ab-pm8941-cdp.dts
	both modified:      arch/arm/boot/dts/msm8974pro-ab-pm8941-mtp.dts
	both modified:      arch/arm/boot/dts/msm8974pro-pm8941.dtsi
	both modified:      arch/arm/boot/dts/msm8974pro.dtsi
	both modified:      arch/arm/common/gic.c
	deleted by us:      arch/arm/configs/msm8226-perf_defconfig
	deleted by us:      arch/arm/configs/msm8226_defconfig
	both modified:      arch/arm/kernel/arch_timer.c
	both modified:      arch/arm/kernel/smp.c
	both modified:      arch/arm/mach-msm/Kconfig
	both modified:      arch/arm/mach-msm/Makefile
	both modified:      arch/arm/mach-msm/bam_dmux.c
	both added:         arch/arm/mach-msm/bam_dmux_private.h
	both modified:      arch/arm/mach-msm/board-8226-gpiomux.c
	both modified:      arch/arm/mach-msm/board-8610-gpiomux.c
	both modified:      arch/arm/mach-msm/board-8974-gpiomux.c
	both modified:      arch/arm/mach-msm/clock-8610.c
	both modified:      arch/arm/mach-msm/clock-8974.c
	both modified:      arch/arm/mach-msm/clock-krait-8974.c
	both modified:      arch/arm/mach-msm/clock-mdss-8974.c
	both modified:      arch/arm/mach-msm/cpr-regulator.c
	both modified:      arch/arm/mach-msm/cpufreq.c
	both added:         arch/arm/mach-msm/devfreq_cpubw.c
	both modified:      arch/arm/mach-msm/include/mach/board.h
	both modified:      arch/arm/mach-msm/include/mach/camera2.h
	both modified:      arch/arm/mach-msm/include/mach/msm_rtb.h
	both modified:      arch/arm/mach-msm/krait-regulator.c
	both modified:      arch/arm/mach-msm/msm-pm.c
	both modified:      arch/arm/mach-msm/msm_rq_stats.c
	both modified:      arch/arm/mach-msm/ocmem.c
	both modified:      arch/arm/mach-msm/restart.c
	both modified:      arch/arm/mach-msm/smd_tty.c
	both modified:      arch/arm/mach-msm/subsystem_restart.c
	both modified:      block/blk-core.c
	both modified:      drivers/base/dma-contiguous.c
	both modified:      drivers/char/diag/diag_dci.c
	both modified:      drivers/char/diag/diag_dci.h
	both modified:      drivers/char/diag/diag_masks.c
	both modified:      drivers/char/diag/diagchar.h
	both modified:      drivers/char/diag/diagchar_core.c
	both modified:      drivers/char/diag/diagfwd.c
	both modified:      drivers/char/diag/diagfwd.h
	both modified:      drivers/char/diag/diagfwd_bridge.c
	both modified:      drivers/crypto/msm/qcrypto.c
	both modified:      drivers/devfreq/devfreq.c
	both added:         drivers/devfreq/governor_cpubw_hwmon.c
	both modified:      drivers/gpio/gpio-msm-common.c
	both modified:      drivers/gpio/qpnp-pin.c
	both modified:      drivers/gpu/ion/ion_heap.c
	both modified:      drivers/gpu/ion/ion_page_pool.c
	both modified:      drivers/gpu/ion/ion_system_heap.c
	both modified:      drivers/gpu/msm/adreno.c
	both modified:      drivers/gpu/msm/adreno_a3xx.c
	both modified:      drivers/gpu/msm/adreno_dispatch.c
	both modified:      drivers/gpu/msm/adreno_drawctxt.c
	both modified:      drivers/gpu/msm/adreno_drawctxt.h
	both modified:      drivers/gpu/msm/adreno_ringbuffer.c
	both modified:      drivers/gpu/msm/kgsl.c
	both modified:      drivers/gpu/msm/kgsl.h
	both modified:      drivers/gpu/msm/kgsl_debugfs.c
	both modified:      drivers/gpu/msm/kgsl_device.h
	both modified:      drivers/gpu/msm/kgsl_iommu.c
	both modified:      drivers/gpu/msm/kgsl_mmu.h
	both modified:      drivers/gpu/msm/kgsl_pwrctrl.c
	both modified:      drivers/gpu/msm/kgsl_pwrscale.c
	both modified:      drivers/gpu/msm/kgsl_sharedmem.c
	both modified:      drivers/gpu/msm/kgsl_sync.c
	both modified:      drivers/gud/MobiCoreDriver/main.c
	both modified:      drivers/hwmon/qpnp-adc-common.c
	both modified:      drivers/i2c/busses/i2c-qup.c
	both modified:      drivers/input/touchscreen/Makefile
	both modified:      drivers/iommu/msm_iommu-v1.c
	both modified:      drivers/leds/leds-qpnp.c
	both modified:      drivers/media/media-device.c
	both modified:      drivers/media/platform/msm/camera_v2/Kconfig
	both modified:      drivers/media/platform/msm/camera_v2/camera/camera.c
	both modified:      drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
	both modified:      drivers/media/platform/msm/camera_v2/isp/msm_isp.h
	both modified:      drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
	both modified:      drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
	both modified:      drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
	both modified:      drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.h
	both modified:      drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
	both modified:      drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
	both modified:      drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
	both modified:      drivers/media/platform/msm/camera_v2/msm.c
	both modified:      drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
	both modified:      drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.h
	both modified:      drivers/media/platform/msm/camera_v2/sensor/Makefile
	both modified:      drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
	both modified:      drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h
	both modified:      drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
	both modified:      drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
	both modified:      drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_i2c_trigger.c
	both modified:      drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
	both modified:      drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
	both modified:      drivers/media/platform/msm/vidc/hfi_packetization.c
	both modified:      drivers/media/platform/msm/vidc/hfi_response_handler.c
	both modified:      drivers/media/platform/msm/vidc/msm_vdec.c
	both modified:      drivers/media/platform/msm/vidc/msm_venc.c
	both modified:      drivers/media/platform/msm/vidc/msm_vidc.c
	both modified:      drivers/media/platform/msm/vidc/msm_vidc_common.c
	both modified:      drivers/media/platform/msm/vidc/msm_vidc_internal.h
	both modified:      drivers/media/platform/msm/vidc/venus_hfi.c
	both modified:      drivers/media/platform/msm/vidc/vidc_hfi.h
	both modified:      drivers/media/platform/msm/vidc/vidc_hfi_api.h
	both modified:      drivers/media/platform/msm/vidc/vidc_hfi_helper.h
	both modified:      drivers/media/radio/radio-iris.c
	both modified:      drivers/mfd/wcd9xxx-irq.c
	both modified:      drivers/misc/qseecom.c
	both modified:      drivers/mmc/card/block.c
	both modified:      drivers/mmc/card/queue.c
	both modified:      drivers/mmc/core/core.c
	both modified:      drivers/mmc/core/host.c
	both modified:      drivers/mmc/core/mmc.c
	both modified:      drivers/mmc/core/sd.c
	both modified:      drivers/mmc/host/sdhci-msm.c
	both modified:      drivers/mmc/host/sdhci.c
	both modified:      drivers/net/wireless/wcnss/wcnss_wlan.c
	both modified:      drivers/platform/msm/qpnp-power-on.c
	both modified:      drivers/platform/msm/qpnp-pwm.c
	both modified:      drivers/power/qpnp-bms.c
	both modified:      drivers/power/qpnp-charger.c
	both modified:      drivers/rtc/alarm.c
	both modified:      drivers/rtc/qpnp-rtc.c
	both modified:      drivers/slimbus/slim-msm-ngd.c
	both modified:      drivers/slimbus/slim-msm.c
	both modified:      drivers/spmi/qpnp-int.c
	both modified:      drivers/spmi/spmi-dbgfs.c
	both modified:      drivers/spmi/spmi-pmic-arb.c
	both modified:      drivers/staging/android/ashmem.c
	both modified:      drivers/thermal/msm_thermal.c
	both modified:      drivers/thermal/qpnp-adc-tm.c
	both modified:      drivers/usb/dwc3/core.c
	both modified:      drivers/usb/dwc3/core.h
	both modified:      drivers/usb/dwc3/dwc3-msm.c
	both modified:      drivers/usb/dwc3/dwc3_otg.c
	both modified:      drivers/usb/dwc3/gadget.c
	both modified:      drivers/usb/gadget/android.c
	both modified:      drivers/usb/gadget/ci13xxx_udc.c
	both modified:      drivers/usb/gadget/f_diag.c
	both modified:      drivers/usb/gadget/f_rmnet.c
	both modified:      drivers/usb/gadget/u_ether.c
	both modified:      drivers/usb/otg/msm_otg.c
	both modified:      drivers/video/msm/mdss/Makefile
	both modified:      drivers/video/msm/mdss/dsi_host_v2.c
	both modified:      drivers/video/msm/mdss/dsi_v2.c
	both modified:      drivers/video/msm/mdss/dsi_v2.h
	both modified:      drivers/video/msm/mdss/mdp3.c
	both modified:      drivers/video/msm/mdss/mdp3_dma.h
	both modified:      drivers/video/msm/mdss/mdp3_hwio.h
	both modified:      drivers/video/msm/mdss/mdp3_ppp.c
	both modified:      drivers/video/msm/mdss/mdss.h
	both modified:      drivers/video/msm/mdss/mdss_debug.c
	both modified:      drivers/video/msm/mdss/mdss_debug.h
	both modified:      drivers/video/msm/mdss/mdss_dsi.c
	both modified:      drivers/video/msm/mdss/mdss_dsi.h
	both modified:      drivers/video/msm/mdss/mdss_dsi_host.c
	both modified:      drivers/video/msm/mdss/mdss_dsi_panel.c
	deleted by us:      drivers/video/msm/mdss/mdss_dsi_status.c
	both modified:      drivers/video/msm/mdss/mdss_edp.c
	both modified:      drivers/video/msm/mdss/mdss_fb.c
	both modified:      drivers/video/msm/mdss/mdss_fb.h
	both modified:      drivers/video/msm/mdss/mdss_hdmi_hdcp.c
	both modified:      drivers/video/msm/mdss/mdss_hdmi_tx.c
	both modified:      drivers/video/msm/mdss/mdss_mdp.c
	both modified:      drivers/video/msm/mdss/mdss_mdp.h
	both modified:      drivers/video/msm/mdss/mdss_mdp_ctl.c
	both modified:      drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
	both modified:      drivers/video/msm/mdss/mdss_mdp_intf_video.c
	both modified:      drivers/video/msm/mdss/mdss_mdp_intf_writeback.c
	both modified:      drivers/video/msm/mdss/mdss_mdp_overlay.c
	both modified:      drivers/video/msm/mdss/mdss_mdp_pipe.c
	both modified:      drivers/video/msm/mdss/mdss_mdp_pp.c
	both modified:      drivers/video/msm/mdss/mdss_mdp_rotator.c
	both modified:      drivers/video/msm/mdss/mdss_mdp_util.c
	both modified:      drivers/video/msm/mdss/mdss_panel.h
	both modified:      drivers/video/msm/mdss/msm_mdss_io_8974.c
	both modified:      fs/ext4/ext4_jbd2.c
	both modified:      fs/ext4/xattr.c
	both modified:      fs/jbd2/journal.c
	both modified:      fs/proc/task_mmu.c
	both modified:      include/linux/Kbuild
	both modified:      include/linux/diagchar.h
	both modified:      include/linux/input.h
	both modified:      include/linux/mmc/card.h
	both modified:      include/linux/mmc/sdhci.h
	both modified:      include/linux/msm_kgsl.h
	both modified:      include/linux/msm_mdp.h
	both modified:      include/linux/msm_vidc_enc.h
	both modified:      include/linux/usb/android.h
	both modified:      include/linux/usb/gadget.h
	both modified:      include/linux/usb/msm_hsusb.h
	both modified:      include/linux/usb/otg.h
	both modified:      include/linux/videodev2.h
	both modified:      include/media/msm_cam_sensor.h
	both modified:      include/media/msm_vidc.h
	both modified:      include/media/radio-iris.h
	both modified:      include/net/ping.h
	both modified:      include/net/tcp.h
	both modified:      include/net/transp_v6.h
	both modified:      include/sound/Kbuild
	both modified:      include/sound/apr_audio-v2.h
	both modified:      include/sound/q6asm-v2.h
	both modified:      kernel/events/core.c
	both modified:      kernel/power/process.c
	both modified:      kernel/rcutree.c
	both modified:      kernel/trace/trace.c
	both modified:      mm/ksm.c
	both modified:      net/ipv4/fib_trie.c
	both modified:      net/ipv4/ping.c
	both modified:      net/ipv4/sysctl_net_ipv4.c
	both modified:      net/ipv4/tcp.c
	both modified:      net/ipv6/icmp.c
	both added:         net/ipv6/ping.c
	both modified:      net/socket.c
	both modified:      net/unix/af_unix.c
	both modified:      net/wireless/db.txt
	both modified:      net/wireless/sme.c
	both modified:      security/selinux/hooks.c
	both modified:      security/selinux/ss/services.c
	both modified:      sound/soc/codecs/msm8x10-wcd.c
	both modified:      sound/soc/codecs/msm_hdmi_codec_rx.c
	both modified:      sound/soc/codecs/wcd9306.c
	both modified:      sound/soc/codecs/wcd9320.c
	both modified:      sound/soc/codecs/wcd9xxx-common.c
	both modified:      sound/soc/codecs/wcd9xxx-common.h
	both modified:      sound/soc/codecs/wcd9xxx-mbhc.c
	both modified:      sound/soc/msm/msm-dai-fe.c
	both modified:      sound/soc/msm/msm8226.c
	both modified:      sound/soc/msm/msm8x10.c
	both modified:      sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
	both modified:      sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
	both modified:      sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
	both modified:      sound/soc/msm/qdsp6v2/q6adm.c
	both modified:      sound/soc/msm/qdsp6v2/q6asm.c
	both modified:      sound/soc/msm/qdsp6v2/q6core.c
	both modified:      sound/soc/msm/qdsp6v2/q6voice.c
	both modified:      sound/soc/msm/qdsp6v2/q6voice.h
	both modified:      sound/soc/soc-compress.c
	both modified:      sound/soc/soc-dapm.c
	both modified:      sound/soc/soc-pcm.c