View source for Quest for Nokia X2 CAF source

==Repo==
Working repo https://github.com/zombah/android_kernel_nokia_msm8610 <br/>
----

==Initial search==
CAF added as remote repo name caf git://codeaurora.org/kernel/msm.git <br/>
<pre>
git remote add caf git://codeaurora.org/kernel/msm.git
git fetch caf
</pre>

Script to find difference between branch RM-1013-2.0.0.11 (gpl source released by Nokia) and CAF <br/>

<pre>
#!/bin/sh
for REV in $(git ls-remote --tags caf |awk '{ print $1; }'); do
#for REV in $(git ls-remote --heads caf |awk '{ print $1; }'); do
   git diff --shortstat $REV RM-1013-2.0.0.11 |tr -d '\n' >> ~/src/rdiffs-tags.csv; 
   echo , "$REV" >> ~/src/rdiffs-tags.csv; 
done
</pre>

you can limit search to only soc generation tag, if you know it, like this:
<pre>
for REV in $(git ls-remote --tags caf |grep 8x10 |awk '{ print $1; }'); do
</pre>

As result i have couple closest match tags:
<pre>
 210 files changed, 77918 insertions(+), 3386 deletions(-), 1aa5a5c427fbcb8f3dd1664a6173bd830994a4c7
 210 files changed, 77918 insertions(+), 3386 deletions(-), 421e8f7da1fece259ebb19b8e45d6ee3f4591b5a
 210 files changed, 77918 insertions(+), 3386 deletions(-), d7ef6f749054f7abf5744af4724302416478ff30
 210 files changed, 77918 insertions(+), 3386 deletions(-), d7ef6f749054f7abf5744af4724302416478ff30
 210 files changed, 77918 insertions(+), 3386 deletions(-), d7ef6f749054f7abf5744af4724302416478ff30
 210 files changed, 77918 insertions(+), 3386 deletions(-), d7ef6f749054f7abf5744af4724302416478ff30
 210 files changed, 77918 insertions(+), 3386 deletions(-), fd27908cd3819abafb96f8c6a1a916b52db68427
 210 files changed, 77918 insertions(+), 3386 deletions(-), ff17e00d86c6903f3ecf76b3c0ab60ef2d3acd27
 212 files changed, 77980 insertions(+), 3518 deletions(-), 1b94a153c7e82d7cec3809ac912b724725fcd80b
</pre>

sort output something like this:
<pre>
awk '{$2=$3=$5=$7=$8=""; print $0}' rdiffs-heads.csv | sort -n -k 1 |less
</pre>

and closest heads:
<pre>
210 files changed, 77918 insertions(+), 3386 deletions(-), d7ef6f749054f7abf5744af4724302416478ff30
</pre>

Closest head is: '''refs/heads/LNX.LA.3.2.7_rb1'''
Closes tags is: '''refs/tags/LNX.LA.3.2.7-00910-8x10.0'''

==First merge attempt==
But simple merge this branch with nokia source will not work becase of various conflicts, <br/>
need to find what else nokia included into '''LNX.LA.3.2.7_rb1'''.

git diff --stat LNX.LA.3.2.7-00910-8x10 RM-1013-2.0.0.11
<pre>
 AndroidKernel.mk                                                        |   20 +-
 Documentation/DocBook/media/dvb/dvbstb.pdf                              |  Bin 1881 -> 0 bytes
 Documentation/DocBook/media/v4l/crop.pdf                                |  Bin 5846 -> 0 bytes
 Documentation/DocBook/media/v4l/fieldseq_bt.pdf                         |  Bin 9185 -> 0 bytes
 Documentation/DocBook/media/v4l/fieldseq_tb.pdf                         |  Bin 9173 -> 0 bytes
 Documentation/DocBook/media/v4l/pipeline.pdf                            |  Bin 20276 -> 0 bytes
 Documentation/DocBook/media/v4l/vbi_525.pdf                             |  Bin 3395 -> 0 bytes
 Documentation/DocBook/media/v4l/vbi_625.pdf                             |  Bin 3683 -> 0 bytes
 Documentation/DocBook/media/v4l/vbi_hsync.pdf                           |  Bin 7405 -> 0 bytes
 Makefile                                                                |    2 +-
 arch/arm/Kconfig                                                        |    3 +
 arch/arm/boot/dts/batterydata-BV5S-1800mAh.dtsi                         |  108 ++
 arch/arm/boot/dts/batterydata-mtp-3000mah.dtsi                          |  108 --
 arch/arm/boot/dts/batterydata-palladium.dtsi                            |  111 --
 arch/arm/boot/dts/batterydata-qrd-4v2-1300mah.dtsi                      |  105 --
 arch/arm/boot/dts/batterydata-qrd-4v2-1800mah.dtsi                      |  105 --
 arch/arm/boot/dts/batterydata-qrd-4v2-2000mah.dtsi                      |  105 --
 arch/arm/boot/dts/batterydata-qrd-4v2-2200mah.dtsi                      |  105 --
 arch/arm/boot/dts/batterydata-qrd-4v35-2000mah.dtsi                     |  109 --
 arch/arm/boot/dts/batterydata-qrd-4v35-2500mah.dtsi                     |  105 --
 arch/arm/boot/dts/c4_touch.dtsi                                         |   84 +
 arch/arm/boot/dts/dsi-panel-chimei-wvga-cmd.dtsi                        |   84 +
 arch/arm/boot/dts/msm-pm8110.dtsi                                       |   34 +-
 arch/arm/boot/dts/msm8610-ara.dts                                       |   25 +
 arch/arm/boot/dts/msm8610-ara.dtsi                                      |  560 ++++++
 arch/arm/boot/dts/msm8610-camera-sensor-ara.dtsi                        |  149 ++
 arch/arm/boot/dts/msm8610-camera-sensor-cdp-mtp.dtsi                    |   95 +-
 arch/arm/boot/dts/msm8610-camera-sensor-leo.dtsi                        |  119 ++
 arch/arm/boot/dts/msm8610-cdp.dtsi                                      |    5 +-
 arch/arm/boot/dts/msm8610-leo.dts                                       |   27 +
 arch/arm/boot/dts/msm8610-leo.dtsi                                      |  564 ++++++
 arch/arm/boot/dts/msm8610-mdss-panels.dtsi                              |    1 +
 arch/arm/boot/dts/msm8610-mtp.dtsi                                      |  135 +-
 arch/arm/boot/dts/msm8610-qrd-skuaa.dtsi                                |    2 +-
 arch/arm/boot/dts/msm8610-qrd-skuab.dtsi                                |    3 +-
 arch/arm/boot/dts/msm8610-regulator.dtsi                                |   12 +-
 arch/arm/boot/dts/msm8610-v1-cdp.dts                                    |    2 +-
 arch/arm/boot/dts/msm8610-v1-mtp.dts                                    |    4 +-
 arch/arm/boot/dts/msm8610-v2-cdp.dts                                    |    3 +-
 arch/arm/boot/dts/msm8610-v2-mtp.dts                                    |    4 +-
 arch/arm/boot/dts/msm8610-v2-qrd-skuab-dvt2.dts                         |    2 +-
 arch/arm/boot/dts/msm8610.dtsi                                          |   39 +-
 arch/arm/boot/dts/sms_dtv.dtsi                                          |   16 +
 arch/arm/configs/leo_defconfig                                          |  530 ++++++
 arch/arm/configs/msm8610-perf_defconfig                                 |  104 +-
 arch/arm/configs/msm8610-sales_defconfig                                |  479 +++++
 arch/arm/configs/msm8610_defconfig                                      |  101 +-
 arch/arm/mach-msm/Kconfig                                               |    7 +
 arch/arm/mach-msm/board-8610-gpiomux.c                                  |  143 +-
 arch/arm/mach-msm/clock-8610.c                                          |   18 +-
 arch/arm/mach-msm/include/mach/msm_iomap.h                              |    3 +
 arch/arm/mach-msm/include/mach/restart.h                                |    5 +
 arch/arm/mach-msm/io.c                                                  |   20 +-
 arch/arm/mach-msm/memory.c                                              |    4 +-
 arch/arm/mach-msm/qdsp6v2/Makefile                                      |    1 +
 arch/arm/mach-msm/qdsp6v2/apr.c                                         |   12 +
 arch/arm/mach-msm/qdsp6v2/atts/Makefile                                 |    1 +
 arch/arm/mach-msm/qdsp6v2/atts/atts.c                                   | 1032 ++++++++++
 arch/arm/mach-msm/qdsp6v2/atts/atts_apr.c                               |  234 +++
 arch/arm/mach-msm/qdsp6v2/atts/atts_private.h                           |  123 ++
 arch/arm/mach-msm/restart.c                                             |   71 +-
 arch/arm/mach-msm/subsystem_restart.c                                   |    3 +
 arch/sh/boot/compressed/vmlinux.scr                                     |   10 -
 arch/sh/boot/romimage/vmlinux.scr                                       |    8 -
 drivers/Kconfig                                                         |    2 +
 drivers/Makefile                                                        |    2 +
 drivers/hwmon/qpnp-adc-common.c                                         |  184 +-
 drivers/input/Kconfig                                                   |    6 +-
 drivers/input/evdev.c                                                   |   90 +-
 drivers/input/misc/Kconfig                                              |   36 +
 drivers/input/misc/Makefile                                             |  123 +-
 drivers/input/misc/apds9930.c                                           | 2972 +++++++++++++++++++++++++++++
 drivers/input/misc/bma250.c                                             | 3173 +++++++++++++++++++++++++++++++
 drivers/input/misc/kionix_accel.c                                       | 1933 +++++++++++++++++++
 drivers/input/misc/ltr554.c                                             | 6024 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/input/misc/n2dm.c                                               | 1693 +++++++++++++++++
 drivers/input/touchscreen/Kconfig                                       |  204 ++
 drivers/input/touchscreen/Makefile                                      |   53 +
 drivers/input/touchscreen/cyttsp4_btn.c                                 |  685 +++++++
 drivers/input/touchscreen/cyttsp4_bus.c                                 |  761 ++++++++
 drivers/input/touchscreen/cyttsp4_core.c                                | 4206 +++++++++++++++++++++++++++++++++++++++++
 drivers/input/touchscreen/cyttsp4_debug.c                               |  623 ++++++
 drivers/input/touchscreen/cyttsp4_device_access.c                       | 4484 ++++++++++++++++++++++++++++++++++++++++++++
 drivers/input/touchscreen/cyttsp4_device_access.h                       |   81 +
 drivers/input/touchscreen/cyttsp4_devtree.c                             |  765 ++++++++
 drivers/input/touchscreen/cyttsp4_devtree.h                             |   36 +
 drivers/input/touchscreen/cyttsp4_i2c.c                                 |  309 +++
 drivers/input/touchscreen/cyttsp4_i2c.h                                 |   35 +
 drivers/input/touchscreen/cyttsp4_input_arbiter.c                       |  189 ++
 drivers/input/touchscreen/cyttsp4_input_arbiter.h                       |   33 +
 drivers/input/touchscreen/cyttsp4_loader.c                              | 2084 +++++++++++++++++++++
 drivers/input/touchscreen/cyttsp4_mt_common.c                           |  869 +++++++++
 drivers/input/touchscreen/cyttsp4_mt_common.h                           |   91 +
 drivers/input/touchscreen/cyttsp4_mta.c                                 |  108 ++
 drivers/input/touchscreen/cyttsp4_mtb.c                                 |  115 ++
 drivers/input/touchscreen/cyttsp4_params.h                              | 1227 ++++++++++++
 drivers/input/touchscreen/cyttsp4_params_amp_ara.h                      | 1224 ++++++++++++
 drivers/input/touchscreen/cyttsp4_params_amp_leo.h                      | 1407 ++++++++++++++
 drivers/input/touchscreen/cyttsp4_params_gis_leo.h                      | 1407 ++++++++++++++
 drivers/input/touchscreen/cyttsp4_params_wtk_ara.h                      | 1224 ++++++++++++
 drivers/input/touchscreen/cyttsp4_platform.c                            |  288 +++
 drivers/input/touchscreen/cyttsp4_proximity.c                           |  591 ++++++
 drivers/input/touchscreen/cyttsp4_regs.h                                |  594 ++++++
 drivers/input/touchscreen/cyttsp4_spi.c                                 |  462 +++++
 drivers/input/touchscreen/cyttsp4_spi.h                                 |   37 +
 drivers/input/touchscreen/cyttsp4_test_device_access_api.c              |  196 ++
 drivers/media/dvb/Kconfig                                               |   19 +-
 drivers/media/dvb/dvb-core/dvb_frontend.c                               |   10 +-
 drivers/media/dvb/siano/Kconfig                                         |   60 +-
 drivers/media/dvb/siano/Makefile                                        |  114 +-
 drivers/media/dvb/siano/sms-cards.c                                     |  358 +++-
 drivers/media/dvb/siano/sms-cards.h                                     |   34 +-
 drivers/media/dvb/siano/smschar.c                                       |  943 ++++++++++
 drivers/media/dvb/siano/smscharioctl.h                                  |   74 +
 drivers/media/dvb/siano/smscoreapi.c                                    | 1620 ++++++++++++----
 drivers/media/dvb/siano/smscoreapi.h                                    | 2345 +++++++++++++++++------
 drivers/media/dvb/siano/smsdbg_prn.h                                    |   56 +
 drivers/media/dvb/siano/smsdvb.c                                        | 1377 ++++++++------
 drivers/media/dvb/siano/smsendian.c                                     |    7 +-
 drivers/media/dvb/siano/smsendian.h                                     |    0
 drivers/media/dvb/siano/smsi2c.c                                        |  451 +++++
 drivers/media/dvb/siano/smsir.c                                         |   83 +-
 drivers/media/dvb/siano/smsir.h                                         |   11 +-
 drivers/media/dvb/siano/smsnet.c                                        |  444 +++++
 drivers/media/dvb/siano/smssdio.c                                       |  140 +-
 drivers/media/dvb/siano/smsspicommon.c                                  |  408 ++++
 drivers/media/dvb/siano/smsspicommon.h                                  |   96 +
 drivers/media/dvb/siano/smsspidrv.c                                     |  883 +++++++++
 drivers/media/dvb/siano/smsspiphy.c                                     |  505 +++++
 drivers/media/dvb/siano/smsspiphy.h                                     |   55 +
 drivers/media/dvb/siano/smsspiphy_pxa.c                                 |  436 +++++
 drivers/media/dvb/siano/smsusb.c                                        |  336 ++--
 drivers/media/platform/msm/camera_v2/Kconfig                            |   65 +
 drivers/media/platform/msm/camera_v2/isp/msm_isp32.c                    |   54 +-
 drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c             |   36 +
 drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.h             |    1 +
 drivers/media/platform/msm/camera_v2/sensor/Makefile                    |   13 +
 drivers/media/platform/msm/camera_v2/sensor/actuator/Makefile           |    3 +-
 drivers/media/platform/msm/camera_v2/sensor/actuator/smiapp_actuator.c  | 1174 ++++++++++++
 drivers/media/platform/msm/camera_v2/sensor/eeprom/Makefile             |    1 +
 drivers/media/platform/msm/camera_v2/sensor/eeprom/smiapp_eeprom.c      |  740 ++++++++
 drivers/media/platform/msm/camera_v2/sensor/flash/Makefile              |    2 +-
 drivers/media/platform/msm/camera_v2/sensor/flash/as3644.c              |  179 ++
 drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_i2c_trigger.c |  112 +-
 drivers/media/platform/msm/camera_v2/sensor/hm03d5.c                    | 1946 +++++++++++++++++++
 drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c     |    2 +-
 drivers/media/platform/msm/camera_v2/sensor/ov7695.c                    | 1557 +++++++++++++++
 drivers/media/platform/msm/camera_v2/sensor/smia65pp.c                  |  274 +++
 drivers/media/platform/msm/camera_v2/sensor/smiapp.c                    |  277 +++
 drivers/media/platform/msm/vidc/msm_vdec.c                              |    9 +-
 drivers/media/platform/msm/vidc/msm_venc.c                              |    9 +-
 drivers/media/radio/radio-iris.c                                        |    2 +-
 drivers/of/of_batterydata.c                                             |    3 +-
 drivers/platform/msm/Kconfig                                            |    6 +
 drivers/platform/msm/Makefile                                           |    1 +
 drivers/platform/msm/lravibrator.c                                      |  259 +++
 drivers/power/Kconfig                                                   |    5 +
 drivers/power/qpnp-bms.c                                                |    5 +
 drivers/power/qpnp-charger.c                                            |   21 +-
 drivers/rtc/alarm-dev.c                                                 |    4 +-
 drivers/rtc/alarm.c                                                     |    4 +
 drivers/rtc/qpnp-rtc.c                                                  |  194 +-
 drivers/sbllog/Kconfig                                                  |   15 +
 drivers/sbllog/Makefile                                                 |    3 +
 drivers/sbllog/sbllog.c                                                 |  184 ++
 drivers/sbllog/sbllog.h                                                 |   34 +
 drivers/spi/spi_qsd.c                                                   |    2 +
 drivers/usb/gadget/android.c                                            |   39 +
 drivers/usb/gadget/f_ncm.c                                              |    8 +-
 drivers/usb/gadget/f_winusb_phonet.c                                    |  823 ++++++++
 drivers/usb/gadget/u_qdss.c                                             |    2 +-
 drivers/usb/gadget/u_uac1.c                                             |    6 +-
 drivers/usb/otg/msm_otg.c                                               |    2 +-
 drivers/video/fbmem.c                                                   |   12 +-
 drivers/video/msm/mdss/dsi_host_v2.c                                    |    1 +
 drivers/video/msm/mdss/dsi_v2.c                                         |   13 +
 drivers/video/msm/mdss/dsi_v2.h                                         |    0
 drivers/video/msm/mdss/mdp3.c                                           |   17 +-
 drivers/video/msm/mdss/mdp3_ctrl.c                                      |   37 +-
 drivers/video/msm/mdss/mdss_dsi.h                                       |    3 +
 drivers/video/msm/mdss/mdss_dsi_panel.c                                 |  139 ++
 drivers/video/msm/mdss/mdss_fb.c                                        |   16 +
 drivers/video/msm/mdss/mdss_panel.h                                     |    4 +
 firmware/Makefile                                                       |    4 +
 drivers/sbllog/sbllog.h                                                 |   34 +
 drivers/spi/spi_qsd.c                                                   |    2 +
 drivers/usb/gadget/android.c                                            |   39 +
 drivers/usb/gadget/f_ncm.c                                              |    8 +-
 drivers/usb/gadget/f_winusb_phonet.c                                    |  823 ++++++++
 drivers/usb/gadget/u_qdss.c                                             |    2 +-
 drivers/usb/gadget/u_uac1.c                                             |    6 +-
 drivers/usb/otg/msm_otg.c                                               |    2 +-
 drivers/video/fbmem.c                                                   |   12 +-
 drivers/video/msm/mdss/dsi_host_v2.c                                    |    1 +
 drivers/video/msm/mdss/dsi_v2.c                                         |   13 +
 drivers/video/msm/mdss/dsi_v2.h                                         |    0
 drivers/video/msm/mdss/mdp3.c                                           |   17 +-
 drivers/video/msm/mdss/mdp3_ctrl.c                                      |   37 +-
 drivers/video/msm/mdss/mdss_dsi.h                                       |    3 +
 drivers/video/msm/mdss/mdss_dsi_panel.c                                 |  139 ++
 drivers/video/msm/mdss/mdss_fb.c                                        |   16 +
 drivers/video/msm/mdss/mdss_panel.h                                     |    4 +
 firmware/Makefile                                                       |    4 +
 firmware/cyttsp4_fw_amp_ara.bin.ihex                                    | 3518 ++++++++++++++++++++++++++++++++++
 firmware/cyttsp4_fw_amp_leo.bin.ihex                                    | 3718 ++++++++++++++++++++++++++++++++++++
 firmware/cyttsp4_fw_gis_leo.bin.ihex                                    | 3718 ++++++++++++++++++++++++++++++++++++
 firmware/cyttsp4_fw_wtk_ara.bin.ihex                                    | 3518 ++++++++++++++++++++++++++++++++++
 include/linux/Kbuild                                                    |    2 +
 include/linux/atts.h                                                    |   92 +
 include/linux/cyttsp4_btn.h                                             |   39 +
 include/linux/cyttsp4_bus.h                                             |  363 ++++
 include/linux/cyttsp4_core.h                                            |  150 ++
 include/linux/cyttsp4_device_access-api.h                               |   56 +
 include/linux/cyttsp4_mt.h                                              |   84 +
 include/linux/cyttsp4_platform.h                                        |   61 +
 include/linux/cyttsp4_proximity.h                                       |   42 +
 include/linux/input/kionix_accel.h                                      |   75 +
 include/linux/input/n2dm.h                                              |   55 +
 include/linux/msm_mdp.h                                                 |    4 +
 include/media/msm_cam_sensor.h                                          |    2 +
 mm/slub.c                                                               |    4 +
 net/bluetooth/l2cap_core.c                                              |    9 +-
 net/l2tp/l2tp_eth.c                                                     |    3 +-
 net/netfilter/nf_conntrack_netlink.c                                    |    2 +-
 net/wireless/nl80211.c                                                  |    4 +-
 security/keys/keyctl.c                                                  |    6 +-
 security/selinux/hooks.c                                                |    5 +
 sound/soc/codecs/wcd9xxx-mbhc.c                                         |   18 +
 sound/soc/msm/msm8x10.c                                                 |   79 +-
 210 files changed, 77918 insertions(+), 3386 deletions(-)
</pre>

git merge RM-1013-2.0.0.11
<pre>
Auto-merging sound/soc/msm/msm8x10.c
CONFLICT (add/add): Merge conflict in sound/soc/msm/msm8x10.c
Auto-merging sound/soc/codecs/wcd9xxx-mbhc.c
CONFLICT (add/add): Merge conflict in sound/soc/codecs/wcd9xxx-mbhc.c
Auto-merging security/selinux/hooks.c
CONFLICT (add/add): Merge conflict in security/selinux/hooks.c
Auto-merging security/keys/keyctl.c
CONFLICT (add/add): Merge conflict in security/keys/keyctl.c
Auto-merging net/wireless/nl80211.c
CONFLICT (add/add): Merge conflict in net/wireless/nl80211.c
Auto-merging net/netfilter/nf_conntrack_netlink.c
CONFLICT (add/add): Merge conflict in net/netfilter/nf_conntrack_netlink.c
Auto-merging net/l2tp/l2tp_eth.c
CONFLICT (add/add): Merge conflict in net/l2tp/l2tp_eth.c
Auto-merging net/bluetooth/l2cap_core.c
CONFLICT (add/add): Merge conflict in net/bluetooth/l2cap_core.c
Auto-merging mm/slub.c
CONFLICT (add/add): Merge conflict in mm/slub.c
Auto-merging include/media/msm_cam_sensor.h
CONFLICT (add/add): Merge conflict in include/media/msm_cam_sensor.h
Auto-merging include/linux/msm_mdp.h
CONFLICT (add/add): Merge conflict in include/linux/msm_mdp.h
Auto-merging include/linux/Kbuild
CONFLICT (add/add): Merge conflict in include/linux/Kbuild
Auto-merging firmware/Makefile
CONFLICT (add/add): Merge conflict in firmware/Makefile
Auto-merging drivers/video/msm/mdss/mdss_panel.h
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/mdss_panel.h
Auto-merging drivers/video/msm/mdss/mdss_fb.c
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/mdss_fb.c
Auto-merging drivers/video/msm/mdss/mdss_dsi_panel.c
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/mdss_dsi_panel.c
Auto-merging drivers/video/msm/mdss/mdss_dsi.h
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/mdss_dsi.h
Auto-merging drivers/video/msm/mdss/mdp3_ctrl.c
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/mdp3_ctrl.c
Auto-merging drivers/video/msm/mdss/mdp3.c
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/mdp3.c
Auto-merging drivers/video/msm/mdss/dsi_v2.h
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/dsi_v2.h
Auto-merging drivers/video/msm/mdss/dsi_v2.c
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/dsi_v2.c
Auto-merging drivers/video/msm/mdss/dsi_host_v2.c
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/dsi_host_v2.c
Auto-merging drivers/video/fbmem.c
CONFLICT (add/add): Merge conflict in drivers/video/fbmem.c
Auto-merging drivers/usb/otg/msm_otg.c
CONFLICT (add/add): Merge conflict in drivers/usb/otg/msm_otg.c
Auto-merging drivers/usb/gadget/u_uac1.c
CONFLICT (add/add): Merge conflict in drivers/usb/gadget/u_uac1.c
Auto-merging drivers/usb/gadget/u_qdss.c
CONFLICT (add/add): Merge conflict in drivers/usb/gadget/u_qdss.c
Auto-merging drivers/usb/gadget/f_ncm.c
CONFLICT (add/add): Merge conflict in drivers/usb/gadget/f_ncm.c
Auto-merging drivers/usb/gadget/android.c
CONFLICT (add/add): Merge conflict in drivers/usb/gadget/android.c
Auto-merging drivers/spi/spi_qsd.c
CONFLICT (add/add): Merge conflict in drivers/spi/spi_qsd.c
Auto-merging drivers/rtc/qpnp-rtc.c
CONFLICT (add/add): Merge conflict in drivers/rtc/qpnp-rtc.c
Auto-merging drivers/rtc/alarm.c
CONFLICT (add/add): Merge conflict in drivers/rtc/alarm.c
Auto-merging drivers/rtc/alarm-dev.c
CONFLICT (add/add): Merge conflict in drivers/rtc/alarm-dev.c
Auto-merging drivers/power/qpnp-charger.c
CONFLICT (add/add): Merge conflict in drivers/power/qpnp-charger.c
Auto-merging drivers/power/qpnp-bms.c
CONFLICT (add/add): Merge conflict in drivers/power/qpnp-bms.c
Auto-merging drivers/power/Kconfig
CONFLICT (add/add): Merge conflict in drivers/power/Kconfig
Auto-merging drivers/platform/msm/Makefile
CONFLICT (add/add): Merge conflict in drivers/platform/msm/Makefile
Auto-merging drivers/platform/msm/Kconfig
CONFLICT (add/add): Merge conflict in drivers/platform/msm/Kconfig
Auto-merging drivers/of/of_batterydata.c
CONFLICT (add/add): Merge conflict in drivers/of/of_batterydata.c
Auto-merging drivers/media/radio/radio-iris.c
CONFLICT (add/add): Merge conflict in drivers/media/radio/radio-iris.c
Auto-merging drivers/media/platform/msm/vidc/msm_venc.c                                                                            [87/9664]
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/vidc/msm_venc.c
Auto-merging drivers/media/platform/msm/vidc/msm_vdec.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/vidc/msm_vdec.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_i2c_trigger.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_i2c_trigger.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/flash/Makefile
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/flash/Makefile
Auto-merging drivers/media/platform/msm/camera_v2/sensor/eeprom/Makefile
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/eeprom/Makefile
Auto-merging drivers/media/platform/msm/camera_v2/sensor/actuator/Makefile
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/actuator/Makefile
Auto-merging drivers/media/platform/msm/camera_v2/sensor/Makefile
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/Makefile
Auto-merging drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.h
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.h
Auto-merging drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
Auto-merging drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
Auto-merging drivers/media/platform/msm/camera_v2/Kconfig
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/Kconfig
Auto-merging drivers/media/dvb/siano/smsusb.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smsusb.c
Auto-merging drivers/media/dvb/siano/smssdio.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smssdio.c
Auto-merging drivers/media/dvb/siano/smsir.h
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smsir.h
Auto-merging drivers/media/dvb/siano/smsir.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smsir.c
Auto-merging drivers/media/dvb/siano/smsendian.h
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smsendian.h
Auto-merging drivers/media/dvb/siano/smsendian.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smsendian.c
Auto-merging drivers/media/dvb/siano/smsdvb.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smsdvb.c
Auto-merging drivers/media/dvb/siano/smscoreapi.h
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smscoreapi.h
Auto-merging drivers/media/dvb/siano/smscoreapi.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smscoreapi.c
Auto-merging drivers/media/dvb/siano/sms-cards.h
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/sms-cards.h
Auto-merging drivers/media/dvb/siano/sms-cards.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/sms-cards.c
Auto-merging drivers/media/dvb/siano/Makefile
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/Makefile                                                             [40/9664]
Auto-merging drivers/media/dvb/siano/Kconfig
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/Kconfig
Auto-merging drivers/media/dvb/dvb-core/dvb_frontend.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/dvb-core/dvb_frontend.c
Auto-merging drivers/media/dvb/Kconfig
CONFLICT (add/add): Merge conflict in drivers/media/dvb/Kconfig
Auto-merging drivers/input/touchscreen/Makefile
CONFLICT (add/add): Merge conflict in drivers/input/touchscreen/Makefile
Auto-merging drivers/input/touchscreen/Kconfig
CONFLICT (add/add): Merge conflict in drivers/input/touchscreen/Kconfig
Auto-merging drivers/input/misc/Makefile
CONFLICT (add/add): Merge conflict in drivers/input/misc/Makefile
Auto-merging drivers/input/misc/Kconfig
CONFLICT (add/add): Merge conflict in drivers/input/misc/Kconfig
Auto-merging drivers/input/evdev.c
CONFLICT (add/add): Merge conflict in drivers/input/evdev.c
Auto-merging drivers/input/Kconfig
CONFLICT (add/add): Merge conflict in drivers/input/Kconfig
Auto-merging drivers/hwmon/qpnp-adc-common.c
CONFLICT (add/add): Merge conflict in drivers/hwmon/qpnp-adc-common.c
Auto-merging drivers/Makefile
CONFLICT (add/add): Merge conflict in drivers/Makefile
Auto-merging drivers/Kconfig
CONFLICT (add/add): Merge conflict in drivers/Kconfig
Auto-merging arch/arm/mach-msm/subsystem_restart.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/subsystem_restart.c
Auto-merging arch/arm/mach-msm/restart.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/restart.c
Auto-merging arch/arm/mach-msm/qdsp6v2/apr.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/qdsp6v2/apr.c
Auto-merging arch/arm/mach-msm/qdsp6v2/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/qdsp6v2/Makefile
Auto-merging arch/arm/mach-msm/memory.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/memory.c
Auto-merging arch/arm/mach-msm/io.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/io.c
Auto-merging arch/arm/mach-msm/include/mach/restart.h
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/include/mach/restart.h
Auto-merging arch/arm/mach-msm/include/mach/msm_iomap.h
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/include/mach/msm_iomap.h
Auto-merging arch/arm/mach-msm/clock-8610.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/clock-8610.c
Auto-merging arch/arm/mach-msm/board-8610-gpiomux.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/board-8610-gpiomux.c
Auto-merging arch/arm/mach-msm/Kconfig
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/Kconfig
Auto-merging arch/arm/configs/msm8610_defconfig
CONFLICT (add/add): Merge conflict in arch/arm/configs/msm8610_defconfig
Auto-merging arch/arm/configs/msm8610-perf_defconfig
CONFLICT (add/add): Merge conflict in arch/arm/configs/msm8610-perf_defconfig
Auto-merging arch/arm/boot/dts/msm8610.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610.dtsi
Auto-merging arch/arm/boot/dts/msm8610-v2-qrd-skuab-dvt2.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-v2-qrd-skuab-dvt2.dts
Auto-merging arch/arm/boot/dts/msm8610-v2-mtp.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-v2-mtp.dts
Auto-merging arch/arm/boot/dts/msm8610-v2-cdp.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-v2-cdp.dts
Auto-merging arch/arm/boot/dts/msm8610-v1-mtp.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-v1-mtp.dts
Auto-merging arch/arm/boot/dts/msm8610-v1-cdp.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-v1-cdp.dts
Auto-merging arch/arm/boot/dts/msm8610-regulator.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-regulator.dtsi
Auto-merging arch/arm/boot/dts/msm8610-qrd-skuab.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-qrd-skuab.dtsi
Auto-merging arch/arm/boot/dts/msm8610-qrd-skuaa.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-qrd-skuaa.dtsi
Auto-merging arch/arm/boot/dts/msm8610-mtp.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-mtp.dtsi
Auto-merging arch/arm/boot/dts/msm8610-mdss-panels.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-mdss-panels.dtsi
Auto-merging arch/arm/boot/dts/msm8610-cdp.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-cdp.dtsi
Auto-merging arch/arm/boot/dts/msm8610-camera-sensor-cdp-mtp.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-camera-sensor-cdp-mtp.dtsi
Auto-merging arch/arm/boot/dts/msm-pm8110.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm-pm8110.dtsi
Auto-merging arch/arm/Kconfig
CONFLICT (add/add): Merge conflict in arch/arm/Kconfig
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging AndroidKernel.mk
CONFLICT (add/add): Merge conflict in AndroidKernel.mk
Automatic merge failed; fix conflicts and then commit the result.
</pre>

===Save git diff stat into file===
To save git diff --stat output to file or script and preserve diffed files path with bash shell use:
<pre>
git diff --stat=$COLUMNS <caf-branch> <vendor-branch> | tee ~/caf-branch-vs-vendor-branch_diff_stat
</pre>

==List executable files==
Vendors usually share gpl sources as not git repo but simple tar archive
and they probably use win32 systems for development because modified files
usually have executable bit enabled on modified files.

So it is good start to list files with exec bit to see what was changed

<pre>
find . -type f -perm /111 > ~/src/somekernel-exec-list
</pre>