API tools faq
paste
Advertisement
bigrushdog

m8_cm_kernel_merge_derp

bigrushdog
Jun 22nd, 2014
295
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Java 6.51 KB | None | 0 0
raw download clone embed print report
  1. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout -b kk4.4
  2. Switched to a new branch 'kk4.4'
  3. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git merge cm/cm-11.0
  4. Auto-merging sound/soc/msm/qdsp6v2/q6voice.c
  5. Auto-merging sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
  6. CONFLICT (content): Merge conflict in sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
  7. Auto-merging sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
  8. Auto-merging drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
  9. CONFLICT (content): Merge conflict in drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
  10. Auto-merging drivers/net/wireless/wcnss/wcnss_wlan.c
  11. CONFLICT (content): Merge conflict in drivers/net/wireless/wcnss/wcnss_wlan.c
  12. Auto-merging drivers/input/touchscreen/synaptics_3k.c
  13. CONFLICT (content): Merge conflict in drivers/input/touchscreen/synaptics_3k.c
  14. Auto-merging drivers/crypto/msm/qcrypto.c
  15. CONFLICT (content): Merge conflict in drivers/crypto/msm/qcrypto.c
  16. Auto-merging drivers/cpufreq/Makefile
  17. Auto-merging arch/arm/mach-msm/cpufreq.c
  18. Auto-merging arch/arm/configs/cm_m8_defconfig
  19. CONFLICT (content): Merge conflict in arch/arm/configs/cm_m8_defconfig
  20. Recorded preimage for 'arch/arm/configs/cm_m8_defconfig'
  21. Recorded preimage for 'drivers/crypto/msm/qcrypto.c'
  22. Recorded preimage for 'drivers/input/touchscreen/synaptics_3k.c'
  23. Recorded preimage for 'drivers/net/wireless/wcnss/wcnss_wlan.c'
  24. Recorded preimage for 'drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c'
  25. Recorded preimage for 'sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c'
  26. Automatic merge failed; fix conflicts and then commit the result.
  27. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git status
  28. # On branch kk4.4
  29. # Changes to be committed:
  30. #
  31. #   modified:   arch/arm/mach-msm/cpufreq.c
  32. #   modified:   drivers/cpufreq/Makefile
  33. #   modified:   drivers/media/media-device.c
  34. #   modified:   drivers/power/qpnp-bms.c
  35. #   modified:   drivers/video/msm/mdss/mdss_fb.c
  36. #   modified:   drivers/video/msm/mdss/mdss_fb.h
  37. #   modified:   drivers/video/msm/mdss/mdss_mdp_intf_video.c
  38. #   modified:   drivers/video/msm/mdss/mdss_mdp_overlay.c
  39. #   modified:   drivers/video/msm/mdss/mdss_mdp_pipe.c
  40. #   modified:   include/linux/msm_mdp.h
  41. #   modified:   include/sound/Kbuild
  42. #   modified:   kernel/futex.c
  43. #   modified:   sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
  44. #   modified:   sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c
  45. #   modified:   sound/soc/msm/qdsp6v2/q6voice.c
  46. #   modified:   sound/soc/msm/qdsp6v2/q6voice.h
  47. #
  48. # Unmerged paths:
  49. #   (use "git add/rm <file>..." as appropriate to mark resolution)
  50. #
  51. #   both modified:      arch/arm/configs/cm_m8_defconfig
  52. #   both modified:      drivers/crypto/msm/qcrypto.c
  53. #   both modified:      drivers/input/touchscreen/synaptics_3k.c
  54. #   both modified:      drivers/net/wireless/wcnss/wcnss_wlan.c
  55. #   both modified:      drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
  56. #   both modified:      sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
  57. #
  58. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout cm/cm-11.0 sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
  59. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout cm/cm-11.0 drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
  60. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout cm/cm-11.0 drivers/net/wireless/wcnss/wcnss_wlan.c
  61. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout teameos/kk4.4 drivers/input/touchscreen/synaptics_3k.c
  62. error: pathspec 'teameos/kk4.4' did not match any file(s) known to git.
  63. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout github/kk44 drivers/input/touchscreen/synaptics_3k.c
  64. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout github/kk44 drivers/crypto/msm/qcrypto.c
  65. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout github/kk44 drivers/cpufreq/Makefile
  66. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git checkout github/kk44 arch/arm/mach-msm/cpufreq.c
  67. bigrushdog@bigrushdog-E6520:~/eos/kernel/htc/msm8974$ git status
  68. # On branch kk4.4
  69. # Changes to be committed:
  70. #
  71. #   modified:   drivers/media/media-device.c
  72. #   modified:   drivers/net/wireless/wcnss/wcnss_wlan.c
  73. #   modified:   drivers/power/qpnp-bms.c
  74. #   modified:   drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
  75. #   modified:   drivers/video/msm/mdss/mdss_fb.c
  76. #   modified:   drivers/video/msm/mdss/mdss_fb.h
  77. #   modified:   drivers/video/msm/mdss/mdss_mdp_intf_video.c
  78. #   modified:   drivers/video/msm/mdss/mdss_mdp_overlay.c
  79. #   modified:   drivers/video/msm/mdss/mdss_mdp_pipe.c
  80. #   modified:   include/linux/msm_mdp.h
  81. #   modified:   include/sound/Kbuild
  82. #   modified:   kernel/futex.c
  83. #   modified:   sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c
  84. #   modified:   sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
  85. #   modified:   sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c
  86. #   modified:   sound/soc/msm/qdsp6v2/q6voice.c
  87. #   modified:   sound/soc/msm/qdsp6v2/q6voice.h
  88. #
  89. # Unmerged paths:
  90. #   (use "git add/rm <file>..." as appropriate to mark resolution)
  91. #
  92. #   both modified:      arch/arm/configs/cm_m8_defconfig
  93.  
  94.  
  95.  
  96. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c: In function 'msm_cpufreq_cpu_callback':
  97. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c:357:3: error: implicit declaration of function 'set_hotplug_on_footprint' [-Werror=implicit-function-declaration]
  98. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c:357:33: error: 'HOF_ENTER' undeclared (first use in this function)
  99. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c:357:33: note: each undeclared identifier is reported only once for each function it appears in
  100. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c:359:34: error: 'HOF_BEFORE_PREPARE_ENABLE_L2' undeclared (first use in this function)
  101. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c:363:34: error: 'HOF_BEFORE_PREPARE_ENABLE_CPU' undeclared (first use in this function)
  102. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c:367:34: error: 'HOF_BEFORE_UPDATE_L2_BW' undeclared (first use in this function)
  103. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c:370:33: error: 'HOF_LEAVE' undeclared (first use in this function)
  104. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c: In function 'cpufreq_parse_dt':
  105. ../../../../../../kernel/htc/msm8974/arch/arm/mach-msm/cpufreq.c:478:7: error: 'arg_cpu_oc' undeclared (first use in this function)
  106. cc1: some warnings being treated as errors
  107. make[3]: *** [arch/arm/mach-msm/cpufreq.o] Error 1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!