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

        both added:         Kconfig
        both added:         Makefile
        both added:         arch/Kconfig
        added by us:        arch/arm/boot/dts/include/dt-bindings
        both added:         arch/arm/boot/dts/qcom/Makefile
        both added:         arch/arm/boot/dts/qcom/apq8084-cdp.dtsi
        both added:         arch/arm/boot/dts/qcom/apq8084-gpu.dtsi
        both added:         arch/arm/boot/dts/qcom/apq8084-liquid.dtsi
        both added:         arch/arm/boot/dts/qcom/apq8084-mdss.dtsi
        both added:         arch/arm/boot/dts/qcom/apq8084-mtp.dtsi
        both added:         arch/arm/boot/dts/qcom/apq8084.dtsi
        both added:         arch/arm/boot/dts/qcom/fsm9010-rumi.dts
        both added:         arch/arm/boot/dts/qcom/fsm9010.dtsi
        both added:         arch/arm/boot/dts/qcom/fsm9900.dtsi
        both added:         arch/arm/boot/dts/qcom/mdm9630.dtsi
        both added:         arch/arm/boot/dts/qcom/msm-pm8909.dtsi
        both added:         arch/arm/boot/dts/qcom/msm-pm8916.dtsi
        both added:         arch/arm/boot/dts/qcom/msm-pmi8994.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8226-gpu.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8226-mdss.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8226.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8610-gpu.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-bus.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-camera-sensor-cdp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-camera-sensor-mtp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-camera.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-cdp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-coresight.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-gpu.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-mdss-pll.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-mdss.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-mtp.dts
        both added:         arch/arm/boot/dts/qcom/msm8909-mtp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-pinctrl.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-qrd-skua.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-qrd-skuc.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-qrd-skue.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909-qrd.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8909.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-camera-sensor-qrd-skui.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-camera-sensor-qrd.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-cdp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-coresight.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-gpu.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-ion.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-mdss-pll.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-mdss.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-memory.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-mtp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-pinctrl.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-qrd-skuh.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-qrd-skui.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-qrd-skut1.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-qrd.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916-regulator.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8916.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8936-coresight.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8936-mtp-wcd9306.dts
        both added:         arch/arm/boot/dts/qcom/msm8936.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-audio-external_codec.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-audio-internal_codec.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-bus.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-camera-sensor-mtp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-cdp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-common.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-coresight.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-gpu.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-mdss-pll.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-mdss.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-mtp-wcd9306.dts
        both added:         arch/arm/boot/dts/qcom/msm8939-mtp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-pm.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-qrd.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939-regulator.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8939.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8974-mdss-pll.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8974-mdss.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8974.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8992.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-cdp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-coresight-v1.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-coresight-v2.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-fluid.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-gpu.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-liquid.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-mdss-pll.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-mdss.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-mtp.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-regulator.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994-v2.dtsi
        both added:         arch/arm/boot/dts/qcom/msm8994.dtsi
        both added:         arch/arm/boot/dts/qcom/msmzirc-cc.dtsi
        both added:         arch/arm/boot/dts/qcom/msmzirc.dtsi
        both added:         arch/arm/boot/dts/qcom/skeleton.dtsi
        both added:         arch/arm/boot/dts/qcom/skeleton64.dtsi
        both added:         arch/arm/configs/fsm9010_defconfig
        both added:         arch/arm/configs/msm8909-1gb_defconfig
        both added:         arch/arm/configs/msm8909_defconfig
        both added:         arch/arm/configs/msm8916-512mb-perf_defconfig
        both added:         arch/arm/configs/msm8916-512mb_defconfig
        both added:         arch/arm/configs/msm8916-perf_defconfig
        both added:         arch/arm/configs/msm8916_defconfig
        both added:         arch/arm/configs/msm_defconfig
        both added:         arch/arm/include/asm/module.h
        both added:         arch/arm/include/asm/setup.h
        both added:         arch/arm/kernel/module.c
        both added:         arch/arm/kernel/process.c
        both added:         arch/arm/kernel/setup.c
        both added:         arch/arm/kernel/smp.c
        both added:         arch/arm/kernel/stacktrace.c
        both added:         arch/arm/mach-msm/Kconfig
        both added:         arch/arm/mach-msm/Makefile
        both added:         arch/arm/mach-msm/board-8916.c
        both added:         arch/arm/mach-msm/hotplug.c
        both added:         arch/arm/mach-msm/include/mach/board.h
        both added:         arch/arm/mach-msm/platsmp.c
        both added:         arch/arm/mach-msm/pp2s.c
        both added:         arch/arm/mm/fault.c
        both added:         arch/arm64/Kconfig
        added by us:        arch/arm64/boot/dts/include/dt-bindings
        added by us:        arch/arm64/boot/dts/qcom
        both added:         arch/arm64/configs/msm-perf_defconfig
        both added:         arch/arm64/configs/msm_defconfig
        both added:         arch/arm64/include/asm/debug-monitors.h
        both added:         arch/arm64/include/asm/insn.h
        both added:         arch/arm64/include/asm/processor.h
        both added:         arch/arm64/include/asm/ptrace.h
        both added:         arch/arm64/include/asm/traps.h
        both added:         arch/arm64/include/uapi/asm/ptrace.h
        both added:         arch/arm64/include/uapi/asm/setup.h
        both added:         arch/arm64/include/uapi/asm/sigcontext.h
        both added:         arch/arm64/kernel/Makefile
        both added:         arch/arm64/kernel/debug-monitors.c
        both added:         arch/arm64/kernel/entry.S
        both added:         arch/arm64/kernel/insn.c
        both added:         arch/arm64/kernel/setup.c
        both added:         arch/arm64/kernel/smp.c
        both added:         arch/arm64/kernel/suspend.c
        both added:         arch/arm64/kernel/traps.c
        both added:         arch/arm64/kernel/vmlinux.lds.S
        both added:         arch/arm64/mm/fault.c
        both added:         arch/arm64/mm/mmu.c
        both added:         arch/microblaze/boot/dts/system.dts
        both added:         block/Kconfig
        both added:         block/blk-core.c
        both added:         block/blk.h
        both added:         block/genhd.c
        both added:         drivers/Kconfig
        both added:         drivers/Makefile
        both added:         drivers/base/cpu.c
        both added:         drivers/base/dma-contiguous.c
        both added:         drivers/base/power/main.c
        both added:         drivers/base/power/wakeup.c
        both added:         drivers/bluetooth/Makefile
        both added:         drivers/char/Kconfig
        both added:         drivers/char/Makefile
        both added:         drivers/char/diag/Kconfig
        both added:         drivers/char/diag/diag_memorydevice.c
        both added:         drivers/char/diag/diag_memorydevice.h
        both added:         drivers/char/diag/diag_mux.c
        both added:         drivers/char/diag/diag_usb.c
        both added:         drivers/char/diag/diagchar.h
        both added:         drivers/char/diag/diagchar_core.c
        both added:         drivers/char/diag/diagfwd.c
        both added:         drivers/char/diag/diagmem.c
        both added:         drivers/char/diag/diagmem.h
        both added:         drivers/char/msm_smd_pkt.c
        both added:         drivers/clk/qcom/clock-cpu-8939.c
        both added:         drivers/clk/qcom/clock-gcc-8909.c
        both added:         drivers/clk/qcom/clock-gcc-8916.c
        both added:         drivers/clk/qcom/clock-gcc-8936.c
        both added:         drivers/clk/qcom/clock-generic.c
        both added:         drivers/clk/qcom/clock-local2.c
        both added:         drivers/clk/qcom/clock-rpm-8909.c
        both added:         drivers/clk/qcom/clock-rpm-8916.c
        both added:         drivers/clk/qcom/clock-rpm-8936.c
        both added:         drivers/clk/qcom/mdss/mdss-dsi-20nm-pll-util.c
        both added:         drivers/clk/qcom/mdss/mdss-dsi-pll-28lpm.c
        both added:         drivers/clk/qcom/mdss/mdss-dsi-pll-util.c
        both added:         drivers/clk/qcom/mdss/mdss-edp-pll-28hpm.c
        both added:         drivers/clk/qcom/mdss/mdss-hdmi-pll-20nm.c
        both added:         drivers/clk/qcom/mdss/mdss-hdmi-pll-28hpm.c
        both added:         drivers/clk/qcom/mdss/mdss-pll.c
        both added:         drivers/clk/qcom/mdss/mdss-pll.h
        both added:         drivers/clocksource/Kconfig
        both added:         drivers/clocksource/arm_arch_timer.c
        both added:         drivers/coresight/coresight-nidnt.c
        both added:         drivers/coresight/coresight-stm.c
        both added:         drivers/cpufreq/cpufreq.c
        both added:         drivers/cpufreq/cpufreq_governor.c
        both added:         drivers/cpufreq/cpufreq_governor.h
        both added:         drivers/cpufreq/cpufreq_interactive.c
        both added:         drivers/cpufreq/qcom-cpufreq.c
        both added:         drivers/cpuidle/Makefile
        both added:         drivers/cpuidle/lpm-levels-of.c
        both added:         drivers/cpuidle/lpm-levels.c
        both added:         drivers/cpuidle/lpm-levels.h
        both added:         drivers/crypto/msm/compat_qcedev.c
        both added:         drivers/crypto/msm/qcedev.c
        both added:         drivers/crypto/msm/qcrypto.c
        both added:         drivers/devfreq/bimc-bwmon.c
        both added:         drivers/devfreq/governor_cpufreq.c
        both added:         drivers/gpu/msm/adreno.c
        both added:         drivers/gpu/msm/adreno.h
        both added:         drivers/gpu/msm/adreno_a3xx.c
        both added:         drivers/gpu/msm/adreno_a4xx.c
        both added:         drivers/gpu/msm/adreno_cp_parser.c
        both added:         drivers/gpu/msm/adreno_debugfs.c
        both added:         drivers/gpu/msm/adreno_dispatch.c
        both added:         drivers/gpu/msm/adreno_drawctxt.c
        both added:         drivers/gpu/msm/adreno_drawctxt.h
        both added:         drivers/gpu/msm/adreno_ringbuffer.c
        both added:         drivers/gpu/msm/adreno_ringbuffer.h
        both added:         drivers/gpu/msm/kgsl.c
        both added:         drivers/gpu/msm/kgsl_device.h
        both added:         drivers/gpu/msm/kgsl_events.c
        both added:         drivers/gpu/msm/kgsl_iommu.c
        both added:         drivers/gpu/msm/kgsl_iommu.h
        both added:         drivers/gpu/msm/kgsl_mmu.c
        both added:         drivers/gpu/msm/kgsl_pwrctrl.c
        both added:         drivers/gpu/msm/kgsl_pwrctrl.h
        both added:         drivers/gpu/msm/kgsl_sharedmem.c
        both added:         drivers/gpu/msm/kgsl_sync.c
        both added:         drivers/gud/Makefile
        both added:         drivers/gud/MobiCoreDriver/Makefile
        both added:         drivers/gud/MobiCoreDriver/api.c
        both added:         drivers/gud/MobiCoreDriver/arm.h
        both added:         drivers/gud/MobiCoreDriver/debug.h
        both added:         drivers/gud/MobiCoreDriver/fastcall.h
        both added:         drivers/gud/MobiCoreDriver/logging.c
        both added:         drivers/gud/MobiCoreDriver/logging.h
        both added:         drivers/gud/MobiCoreDriver/main.c
        both added:         drivers/gud/MobiCoreDriver/main.h
        both added:         drivers/gud/MobiCoreDriver/mem.c
        both added:         drivers/gud/MobiCoreDriver/mem.h
        both added:         drivers/gud/MobiCoreDriver/ops.c
        both added:         drivers/gud/MobiCoreDriver/ops.h
        both added:         drivers/gud/MobiCoreDriver/platforms/MSM8960_SURF_STD/platform.h
        both added:         drivers/gud/MobiCoreDriver/pm.c
        both added:         drivers/gud/MobiCoreDriver/pm.h
        both added:         drivers/gud/MobiCoreDriver/public/mc_kernel_api.h
        both added:         drivers/gud/MobiCoreDriver/public/mc_linux.h
        both added:         drivers/gud/MobiCoreDriver/public/version.h
        both added:         drivers/gud/MobiCoreKernelApi/Makefile
        both added:         drivers/gud/MobiCoreKernelApi/clientlib.c
        both added:         drivers/gud/MobiCoreKernelApi/common.h
        both added:         drivers/gud/MobiCoreKernelApi/connection.c
        both added:         drivers/gud/MobiCoreKernelApi/connection.h
        both added:         drivers/gud/MobiCoreKernelApi/device.c
        both added:         drivers/gud/MobiCoreKernelApi/device.h
        both added:         drivers/gud/MobiCoreKernelApi/include/mcinq.h
        both added:         drivers/gud/MobiCoreKernelApi/include/mcuuid.h
        both added:         drivers/gud/MobiCoreKernelApi/main.c
        both added:         drivers/gud/MobiCoreKernelApi/public/mobicore_driver_api.h
        both added:         drivers/gud/MobiCoreKernelApi/public/mobicore_driver_cmd.h
        both added:         drivers/gud/MobiCoreKernelApi/session.c
        both added:         drivers/gud/MobiCoreKernelApi/session.h
        both added:         drivers/gud/MobiCoreKernelApi/wsm.h
        both added:         drivers/gud/README
        both added:         drivers/gud/build_tag.h
        both added:         drivers/gud/setupDrivers.sh
        both added:         drivers/hwmon/qpnp-adc-common.c
        both added:         drivers/hwmon/qpnp-adc-voltage.c
        both added:         drivers/i2c/busses/i2c-msm-v2.c
        both added:         drivers/i2c/busses/i2c-msm-v2.h
        both added:         drivers/input/Kconfig
        both added:         drivers/input/Makefile
        both added:         drivers/input/evdev.c
        both added:         drivers/input/input.c
        both added:         drivers/input/keyboard/gpio_keys.c
        both added:         drivers/input/misc/Kconfig
        both added:         drivers/input/misc/Makefile
        both added:         drivers/input/misc/akm09911.c
        both added:         drivers/input/misc/akm8963.c
        both added:         drivers/input/misc/bma2x2.c
        both added:         drivers/input/misc/cm36283.c
        both added:         drivers/input/misc/kxtj9.c
        both added:         drivers/input/misc/lis3dh_acc.c
        both added:         drivers/input/misc/mma8x5x.c
        both added:         drivers/input/misc/mmc3416x.c
        both added:         drivers/input/misc/mpu3050.c
        both added:         drivers/input/misc/mpu6050.c
        both added:         drivers/input/misc/mpu6050.h
        both added:         drivers/input/misc/stk3x1x.c
        both added:         drivers/input/touchscreen/Kconfig
        both added:         drivers/input/touchscreen/Makefile
        both added:         drivers/input/touchscreen/atmel_mxt_ts.c
        both added:         drivers/input/touchscreen/bu21150.c
        both added:         drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
        both added:         drivers/iommu/Kconfig
        both added:         drivers/iommu/msm_iommu-v1.c
        both added:         drivers/iommu/msm_iommu_dev-v1.c
        both added:         drivers/iommu/msm_iommu_domains.c
        both added:         drivers/iommu/msm_iommu_hw-v1.h
        both added:         drivers/iommu/msm_iommu_sec.c
        both added:         drivers/irqchip/msm_show_resume_irq.c
        both added:         drivers/leds/leds-gpio.c
        both added:         drivers/leds/leds-qpnp-wled.c
        both added:         drivers/md/dm-req-crypt.c
        both added:         drivers/md/dm.c
        both added:         drivers/media/platform/msm/Kconfig
        both added:         drivers/media/platform/msm/Makefile
        both added:         drivers/media/platform/msm/camera_v2/Kconfig
        both added:         drivers/media/platform/msm/camera_v2/Makefile
        both added:         drivers/media/platform/msm/camera_v2/camera/camera.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp.h
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp44.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp46.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.h
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
        both added:         drivers/media/platform/msm/camera_v2/isp/msm_isp_util.h
        both added:         drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
        both added:         drivers/media/platform/msm/camera_v2/ispif/msm_ispif.h
        both added:         drivers/media/platform/msm/camera_v2/msm.c
        both added:         drivers/media/platform/msm/camera_v2/msm.h
        both added:         drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c
        both added:         drivers/media/platform/msm/camera_v2/msm_sd.h
        both added:         drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
        both added:         drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/Makefile
        both added:         drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_1_hwreg.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/flash/Makefile
        both added:         drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_i2c_trigger.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_trigger.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.h
        both added:         drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c
        both added:         drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c
        both added:         drivers/media/platform/msm/vidc/Makefile
        both added:         drivers/media/platform/msm/vidc/hfi_response_handler.c
        both added:         drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
        both added:         drivers/media/platform/msm/vidc/msm_vdec.c
        both added:         drivers/media/platform/msm/vidc/msm_venc.c
        both added:         drivers/media/platform/msm/vidc/msm_vidc.c
        both added:         drivers/media/platform/msm/vidc/msm_vidc_common.c
        both added:         drivers/media/platform/msm/vidc/msm_vidc_common.h
        both added:         drivers/media/platform/msm/vidc/msm_vidc_debug.c
        both added:         drivers/media/platform/msm/vidc/msm_vidc_debug.h
        both added:         drivers/media/platform/msm/vidc/msm_vidc_internal.h
        both added:         drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
        both added:         drivers/media/platform/msm/vidc/msm_vidc_resources.h
        both added:         drivers/media/platform/msm/vidc/venus_hfi.c
        both added:         drivers/media/platform/msm/vidc/vidc_hfi_api.h
        both added:         drivers/media/radio/silabs/radio-silabs.c
        both added:         drivers/media/radio/silabs/radio-silabs.h
        both added:         drivers/mfd/Kconfig
        both added:         drivers/mfd/Makefile
        both added:         drivers/mfd/wcd9xxx-core.c
        both added:         drivers/mfd/wcd9xxx-irq.c
        both added:         drivers/misc/Kconfig
        both added:         drivers/misc/Makefile
        both added:         drivers/misc/apds993x.c
        both added:         drivers/misc/qseecom.c
        both added:         drivers/mmc/Kconfig
        both added:         drivers/mmc/Makefile
        both added:         drivers/mmc/card/Kconfig
        both added:         drivers/mmc/card/Makefile
        both added:         drivers/mmc/card/block.c
        both added:         drivers/mmc/card/queue.c
        both added:         drivers/mmc/core/Kconfig
        both added:         drivers/mmc/core/bus.c
        both added:         drivers/mmc/core/core.c
        both added:         drivers/mmc/core/debugfs.c
        both added:         drivers/mmc/core/host.c
        both added:         drivers/mmc/core/mmc.c
        both added:         drivers/mmc/core/mmc_ops.c
        both added:         drivers/mmc/core/sd.c
        both added:         drivers/mmc/core/sd_ops.c
        both added:         drivers/mmc/core/slot-gpio.c
        both added:         drivers/mmc/host/sdhci-msm.c
        both added:         drivers/mmc/host/sdhci.c
        both added:         drivers/mmc/host/sdhci.h
        both added:         drivers/net/ethernet/msm/msm_rmnet_bam.c
        both added:         drivers/net/wireless/Kconfig
        both added:         drivers/net/wireless/Makefile
        both added:         drivers/net/wireless/cnss/cnss.c
        both added:         drivers/net/wireless/wcnss/wcnss_vreg.c
        both added:         drivers/net/wireless/wcnss/wcnss_wlan.c
        both added:         drivers/nfc/Kconfig
        both added:         drivers/nfc/Makefile
        both added:         drivers/nfc/nfc-nci.c
        both added:         drivers/of/of_batterydata.c
        both added:         drivers/pinctrl/core.c
        both added:         drivers/pinctrl/pinctrl-msm-tlmm.c
        both added:         drivers/pinctrl/pinctrl-msm.c
        both added:         drivers/platform/msm/Kconfig
        both added:         drivers/platform/msm/Makefile
        both added:         drivers/platform/msm/msm_bus/msm_bus_rules.c
        both added:         drivers/platform/msm/qpnp-power-on.c
        both added:         drivers/platform/msm/qpnp-revid.c
        both added:         drivers/platform/msm/qpnp-vibrator.c
        both added:         drivers/power/Kconfig
        both added:         drivers/power/Makefile
        both added:         drivers/power/batterydata-interface.c
        both added:         drivers/power/power_supply_sysfs.c
        both added:         drivers/power/qcom/msm-pm.c
        both added:         drivers/power/qpnp-fg.c
        both added:         drivers/power/qpnp-linear-charger.c
        both added:         drivers/power/qpnp-vm-bms.c
        both added:         drivers/power/reset/Kconfig
        both added:         drivers/power/reset/msm-poweroff.c
        both added:         drivers/power/smb135x-charger.c
        both added:         drivers/power/smb1360-charger-fg.c
        both added:         drivers/power/smb358-charger.c
        both added:         drivers/regulator/core.c
        both added:         drivers/regulator/cpr-regulator.c
        both added:         drivers/regulator/mem-acc-regulator.c
        both added:         drivers/regulator/onsemi-ncp6335d.c
        both added:         drivers/regulator/tps65132-regulator.c
        both added:         drivers/scsi/sd.c
        both added:         drivers/sensors/Makefile
        both added:         drivers/sensors/sensors_class.c
        both added:         drivers/slimbus/slim-msm-ctrl.c
        both added:         drivers/slimbus/slim-msm-ngd.c
        both added:         drivers/slimbus/slim-msm.c
        both added:         drivers/slimbus/slim-msm.h
        both added:         drivers/soc/qcom/Kconfig
        both added:         drivers/soc/qcom/Makefile
        both added:         drivers/soc/qcom/bam_dmux.c
        both added:         drivers/soc/qcom/ipc_router_smd_xprt.c
        both added:         drivers/soc/qcom/jtag-fuse.c
        both added:         drivers/soc/qcom/jtagv8.c
        both added:         drivers/soc/qcom/memshare/msm_memshare.c
        both added:         drivers/soc/qcom/msm_rq_stats.c
        both added:         drivers/soc/qcom/peripheral-loader.c
        both added:         drivers/soc/qcom/pil-msa.c
        both added:         drivers/soc/qcom/pil-q6v5-mss.c
        both added:         drivers/soc/qcom/qdsp6v2/apr.c
        both added:         drivers/soc/qcom/qdsp6v2/msm_audio_ion.c
        both added:         drivers/soc/qcom/rpm_log.c
        both added:         drivers/soc/qcom/scm.c
        both added:         drivers/soc/qcom/smd.c
        both added:         drivers/soc/qcom/smd_init_dt.c
        both added:         drivers/soc/qcom/smd_private.h
        both added:         drivers/soc/qcom/smem.c
        both added:         drivers/soc/qcom/smem_log.c
        both added:         drivers/soc/qcom/socinfo.c
        both added:         drivers/soc/qcom/spm.c
        both added:         drivers/soc/qcom/spm_devices.c
        both added:         drivers/soc/qcom/spm_driver.h
        both added:         drivers/soc/qcom/subsys-pil-tz.c
        both added:         drivers/soc/qcom/subsystem_restart.c
        both added:         drivers/soc/qcom/watchdog_v2.c
        both added:         drivers/spi/spi_qsd.c
        both added:         drivers/spmi/qpnp-int.c
        both added:         drivers/spmi/spmi-pmic-arb.c
        both added:         drivers/staging/android/Kconfig
        both added:         drivers/staging/android/Makefile
        both added:         drivers/staging/android/binder.c
        both added:         drivers/staging/android/ion/ion.c
        both added:         drivers/staging/android/logger.c
        both added:         drivers/staging/android/logger.h
        both added:         drivers/staging/android/lowmemorykiller.c
        both added:         drivers/staging/android/sync.c
        both added:         drivers/staging/zram/zram_drv.c
        both added:         drivers/thermal/lmh_lite.c
        both added:         drivers/thermal/msm8974-tsens.c
        both added:         drivers/thermal/msm_thermal.c
        both added:         drivers/thermal/qpnp-adc-tm.c
        both added:         drivers/tty/serial/msm_serial_hs_lite.c
        both added:         drivers/tty/sysrq.c
        both added:         drivers/usb/Kconfig
        both added:         drivers/usb/Makefile
        both added:         drivers/usb/core/message.c
        both added:         drivers/usb/dwc3/dwc3-msm.c
        both added:         drivers/usb/gadget/android.c
        both added:         drivers/usb/gadget/ci13xxx_msm.c
        both added:         drivers/usb/gadget/ci13xxx_udc.c
        both added:         drivers/usb/gadget/ci13xxx_udc.h
        both added:         drivers/usb/gadget/composite.c
        both added:         drivers/usb/gadget/f_diag.c
        both added:         drivers/usb/gadget/f_fs.c
        both added:         drivers/usb/gadget/f_mass_storage.c
        both added:         drivers/usb/gadget/f_qdss.c
        both added:         drivers/usb/gadget/f_rndis.c
        both added:         drivers/usb/gadget/storage_common.c
        both added:         drivers/usb/gadget/u_ether.c
        both added:         drivers/usb/gadget/u_smd.c
        both added:         drivers/usb/gadget/usbstring.c
        both added:         drivers/usb/host/ehci-msm.c
        both added:         drivers/usb/host/ehci-q.c
        both added:         drivers/usb/phy/Kconfig
        both added:         drivers/usb/phy/phy-msm-usb.c
        both added:         drivers/video/backlight/Kconfig
        both added:         drivers/video/backlight/Makefile
        both added:         drivers/video/fbmem.c
        both added:         drivers/video/msm/mdp.c
        both added:         drivers/video/msm/mdss/Kconfig
        both added:         drivers/video/msm/mdss/Makefile
        both added:         drivers/video/msm/mdss/dsi_status_6g.c
        both added:         drivers/video/msm/mdss/mdp3.c
        both added:         drivers/video/msm/mdss/mdp3.h
        both added:         drivers/video/msm/mdss/mdp3_ctrl.c
        both added:         drivers/video/msm/mdss/mdp3_ppp.c
        both added:         drivers/video/msm/mdss/mdss.h
        both added:         drivers/video/msm/mdss/mdss_compat_utils.c
        both added:         drivers/video/msm/mdss/mdss_debug.c
        both added:         drivers/video/msm/mdss/mdss_debug_xlog.c
        both added:         drivers/video/msm/mdss/mdss_dsi.c
        both added:         drivers/video/msm/mdss/mdss_dsi.h
        both added:         drivers/video/msm/mdss/mdss_dsi_host.c
        both added:         drivers/video/msm/mdss/mdss_dsi_panel.c
        both added:         drivers/video/msm/mdss/mdss_dsi_status.c
        both added:         drivers/video/msm/mdss/mdss_fb.c
        both added:         drivers/video/msm/mdss/mdss_fb.h
        both added:         drivers/video/msm/mdss/mdss_io_util.c
        both added:         drivers/video/msm/mdss/mdss_mdp.c
        both added:         drivers/video/msm/mdss/mdss_mdp.h
        both added:         drivers/video/msm/mdss/mdss_mdp_ctl.c
        both added:         drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
        both added:         drivers/video/msm/mdss/mdss_mdp_intf_video.c
        both added:         drivers/video/msm/mdss/mdss_mdp_overlay.c
        both added:         drivers/video/msm/mdss/mdss_mdp_pipe.c
        both added:         drivers/video/msm/mdss/mdss_mdp_pp.c
        both added:         drivers/video/msm/mdss/mdss_mdp_rotator.c
        both added:         drivers/video/msm/mdss/mdss_mdp_splash_logo.c
        both added:         drivers/video/msm/mdss/mdss_mdp_trace.h
        both added:         drivers/video/msm/mdss/mdss_mdp_util.c
        both added:         drivers/video/msm/mdss/mdss_panel.h
        both added:         drivers/video/msm/mdss/mdss_wb.c
        both added:         drivers/video/msm/mdss/msm_mdss_io_8974.c
        both added:         fs/Kconfig
        both added:         fs/Makefile
        both added:         fs/block_dev.c
        both added:         fs/buffer.c
        both added:         fs/exec.c
        both added:         fs/ext3/inode.c
        both added:         fs/ext4/Kconfig
        both added:         fs/ext4/ext4.h
        both added:         fs/ext4/inline.c
        both added:         fs/ext4/namei.c
        both added:         fs/ext4/super.c
        both added:         fs/fuse/file.c
        both added:         fs/namespace.c
        both added:         fs/notify/mark.c
        both added:         fs/notify/notification.c
        both added:         fs/proc/Kconfig
        both added:         fs/proc/Makefile
        both added:         fs/proc/base.c
        both added:         fs/proc/internal.h
        both added:         fs/proc/task_mmu.c
        both added:         fs/proc/version.c
        both added:         fs/super.c
        both added:         include/asm-generic/emergency-restart.h
        both added:         include/clocksource/arm_arch_timer.h
        both added:         include/dt-bindings/clock/fsm-clocks-9010.h
        both added:         include/dt-bindings/clock/msm-clocks-8909.h
        both added:         include/dt-bindings/clock/msm-clocks-8916.h
        both added:         include/dt-bindings/clock/msm-clocks-8936.h
        both added:         include/dt-bindings/clock/msm-clocks-zirc.h
        both added:         include/linux/batterydata-lib.h
        both added:         include/linux/blkdev.h
        both added:         include/linux/buffer_head.h
        both added:         include/linux/cgroup_subsys.h
        both added:         include/linux/cpufreq.h
        both added:         include/linux/diagchar.h
        both added:         include/linux/fs.h
        both added:         include/linux/genhd.h
        both added:         include/linux/hrtimer.h
        both added:         include/linux/i2c/atmel_mxt_ts.h
        both added:         include/linux/init_task.h
        both added:         include/linux/kernel_stat.h
        both added:         include/linux/ksm.h
        both added:         include/linux/libfdt_env.h
        both added:         include/linux/mfd/wcd9xxx/core.h
        both added:         include/linux/mm.h
        both added:         include/linux/mmc/card.h
        both added:         include/linux/mmc/host.h
        both added:         include/linux/mmc/mmc.h
        both added:         include/linux/mmc/sdhci.h
        both added:         include/linux/mmzone.h
        both added:         include/linux/msm_kgsl.h
        both added:         include/linux/msm_thermal.h
        both added:         include/linux/namei.h
        both added:         include/linux/netlink.h
        both added:         include/linux/notifier.h
        both added:         include/linux/of_batterydata.h
        both added:         include/linux/page-isolation.h
        both added:         include/linux/pinctrl/pinctrl.h
        both added:         include/linux/pm_wakeup.h
        both added:         include/linux/power_supply.h
        both added:         include/linux/printk.h
        both added:         include/linux/qcom-spi.h
        both added:         include/linux/qcom_iommu.h
        both added:         include/linux/qpnp/power-on.h
        both added:         include/linux/qpnp/qpnp-adc.h
        both added:         include/linux/reboot.h
        both added:         include/linux/regulator/consumer.h
        both added:         include/linux/regulator/onsemi-ncp6335d.h
        both added:         include/linux/rmap.h
        both added:         include/linux/sched.h
        both added:         include/linux/sched/sysctl.h
        both added:         include/linux/sensors.h
        both added:         include/linux/spi/spi.h
        both added:         include/linux/swap.h
        both added:         include/linux/sysrq.h
        both added:         include/linux/usb/msm_hsusb.h
        both added:         include/linux/vmalloc.h
        both added:         include/linux/vmpressure.h
        both added:         include/linux/wcnss_wlan.h
        both added:         include/media/camera2.h
        both added:         include/media/msm_cam_sensor.h
        both added:         include/media/msm_camsensor_sdk.h
        both added:         include/media/msmb_camera.h
        both added:         include/media/msmb_isp.h
        both added:         include/net/cnss.h
        both added:         include/net/fib_rules.h
        both added:         include/net/flow.h
        both added:         include/net/ip.h
        both added:         include/net/route.h
        both added:         include/soc/qcom/camera2.h
        both added:         include/soc/qcom/memory_dump.h
        both added:         include/soc/qcom/pm.h
        both added:         include/soc/qcom/smd.h
        both added:         include/soc/qcom/smem.h
        both added:         include/soc/qcom/socinfo.h
        both added:         include/soc/qcom/spm.h
        both added:         include/soc/qcom/subsystem_restart.h
        both added:         include/sound/apr_audio-v2.h
        both added:         include/sound/msm-dai-q6-v2.h
        both added:         include/sound/q6adm-v2.h
        both added:         include/trace/events/power.h
        both added:         include/trace/events/sched.h
        both added:         include/trace/events/trace_msm_bus.h
        both added:         include/uapi/linux/fib_rules.h
        both added:         include/uapi/linux/mmc/ioctl.h
        both added:         include/uapi/linux/msm_audio_calibration.h
        both added:         include/uapi/linux/msm_mdp.h
        both added:         include/uapi/linux/msm_rmnet.h
        both added:         include/uapi/linux/rtnetlink.h
        both added:         include/uapi/media/Kbuild
        both added:         include/uapi/sound/devdep_params.h
        both added:         init/Kconfig
        both added:         init/main.c
        both added:         init/version.c
        both added:         kernel/Makefile
        both added:         kernel/cpu.c
        both added:         kernel/fork.c
        both added:         kernel/hrtimer.c
        both added:         kernel/hung_task.c
        both added:         kernel/irq_work.c
        both added:         kernel/module.c
        both added:         kernel/notifier.c
        both added:         kernel/power/main.c
        both added:         kernel/power/power.h
        both added:         kernel/power/process.c
        both added:         kernel/power/suspend.c
        both added:         kernel/power/wakelock.c
        both added:         kernel/printk.c
        both added:         kernel/sched/core.c
        both added:         kernel/sched/debug.c
        both added:         kernel/sched/fair.c
        both added:         kernel/sched/rt.c
        both added:         kernel/sched/sched.h
        both added:         kernel/signal.c
        both added:         kernel/sys.c
        both added:         kernel/sysctl.c
        both added:         kernel/time/alarmtimer.c
        both added:         kernel/trace/msm_rtb.c
        both added:         kernel/trace/power-traces.c
        both added:         kernel/workqueue.c
        both added:         lib/Kconfig.debug
        both added:         mm/Kconfig
        both added:         mm/Makefile
        both added:         mm/huge_memory.c
        both added:         mm/internal.h
        both added:         mm/kmemleak.c
        both added:         mm/ksm.c
        both added:         mm/memory-failure.c
        both added:         mm/memory.c
        both added:         mm/migrate.c
        both added:         mm/page_alloc.c
        both added:         mm/page_isolation.c
        both added:         mm/pagewalk.c
        both added:         mm/rmap.c
        both added:         mm/showmem.c
        both added:         mm/slab.c
        both added:         mm/swap.c
        both added:         mm/swap_state.c
        both added:         mm/swapfile.c
        both added:         mm/vmalloc.c
        both added:         mm/vmpressure.c
        both added:         mm/vmscan.c
        both added:         net/core/dev.c
        both added:         net/core/fib_rules.c
        both added:         net/core/sockev_nlmcast.c
        both added:         net/ipv4/fib_frontend.c
        both added:         net/ipv4/inet_connection_sock.c
        both added:         net/ipv4/ip_output.c
        both added:         net/ipv4/ping.c
        both added:         net/ipv4/raw.c
        both added:         net/ipv4/route.c
        both added:         net/ipv4/syncookies.c
        both added:         net/ipv4/udp.c
        both added:         net/ipv4/xfrm4_policy.c
        both added:         net/ipv6/af_inet6.c
        both added:         net/ipv6/datagram.c
        both added:         net/ipv6/inet6_connection_sock.c
        both added:         net/ipv6/ping.c
        both added:         net/ipv6/raw.c
        both added:         net/ipv6/route.c
        both added:         net/ipv6/syncookies.c
        both added:         net/ipv6/tcp_ipv6.c
        both added:         net/ipv6/udp.c
        both added:         net/netfilter/xt_qtaguid.c
        both added:         net/rmnet_data/rmnet_data_config.c
        both added:         net/rmnet_data/rmnet_data_trace.h
        both added:         net/socket.c
        both added:         net/wireless/db.txt
        both added:         scripts/dtc/libfdt/fdt.c
        both added:         scripts/dtc/libfdt/fdt_rw.c
        both added:         scripts/mkcompile_h
        both added:         security/selinux/hooks.c
        both added:         sound/Makefile
        both added:         sound/soc/codecs/Makefile
        both added:         sound/soc/codecs/msm8916-wcd-irq.c
        both added:         sound/soc/codecs/msm8x16-wcd-tables.c
        both added:         sound/soc/codecs/msm8x16-wcd.c
        both added:         sound/soc/codecs/msm8x16-wcd.h
        both added:         sound/soc/codecs/msm_hdmi_codec_rx.c
        both added:         sound/soc/codecs/msm_stub.c
        both added:         sound/soc/codecs/wcd-mbhc-v2.c
        both added:         sound/soc/codecs/wcd-mbhc-v2.h
        both added:         sound/soc/codecs/wcd9306.c
        both added:         sound/soc/codecs/wcd9330.c
        both added:         sound/soc/codecs/wcd9xxx-mbhc.c
        both added:         sound/soc/codecs/wcd9xxx-mbhc.h
        both added:         sound/soc/codecs/wcd_cpe_core.c
        both added:         sound/soc/codecs/wcd_cpe_core.h
        both added:         sound/soc/codecs/wcd_cpe_services.c
        both added:         sound/soc/msm/Kconfig
        both added:         sound/soc/msm/apq8084.c
        both added:         sound/soc/msm/mdm9630.c
        both added:         sound/soc/msm/msm-cpe-lsm.c
        both added:         sound/soc/msm/msm-dai-fe.c
        both added:         sound/soc/msm/msm-pcm-hostless.c
        both added:         sound/soc/msm/msm8939-slimbus.c
        both added:         sound/soc/msm/msm8994.c
        both added:         sound/soc/msm/msm8x16.c
        both added:         sound/soc/msm/msmzirc.c
        both added:         sound/soc/msm/qdsp6v2/audio_cal_utils.c
        both added:         sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-dai-q6-hdmi-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-dai-stub-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c
        both added:         sound/soc/msm/qdsp6v2/msm-ds2-dap-config.h
        both added:         sound/soc/msm/qdsp6v2/msm-dts-srs-tm-config.c
        both added:         sound/soc/msm/qdsp6v2/msm-dts-srs-tm-config.h
        both added:         sound/soc/msm/qdsp6v2/msm-lsm-client.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-afe-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-dtmf-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-host-voice-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-lpa-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c
        both added:         sound/soc/msm/qdsp6v2/msm-pcm-voip-v2.c
        both added:         sound/soc/msm/qdsp6v2/q6adm.c
        both added:         sound/soc/msm/qdsp6v2/q6afe.c
        both added:         sound/soc/msm/qdsp6v2/q6asm.c
        both added:         sound/soc/msm/qdsp6v2/q6core.c
        both added:         sound/soc/soc-compress.c
        both added:         sound/soc/soc-core.c
        both added:         sound/soc/soc-dapm.c
        both added:         sound/soc/soc-pcm.c