Skip to content

Instantly share code, notes, and snippets.

@DD3Boh
Created July 19, 2017 14:59
Show Gist options
  • Save DD3Boh/6c51fd3c5f91b1042e956771483714de to your computer and use it in GitHub Desktop.
Save DD3Boh/6c51fd3c5f91b1042e956771483714de to your computer and use it in GitHub Desktop.
How to merge a newer CAF tag in an android kernel
First go here:
https://wiki.codeaurora.org/xwiki/bin/QAEP/release
This site gives information about all msm soc release details with tag + android version
Search your msm here.. Check the latest one and look for correct android version and mark that tag.
Now open one of the following links (dependent on your linux kernel version)
3.10: https://source.codeaurora.org/quic/la/kernel/msm-3.10/
3.18: https://source.codeaurora.org/quic/la/kernel/msm-3.18/
4.4: https://source.codeaurora.org/quic/la/kernel/msm-4.4/
Choose the right one and copy it, now go into your kernel folder with a terminal and do
git fetch <repo link> <tag>
example:
git fetch https://source.codeaurora.org/quic/la/kernel/msm-3.18/ LA.UM.5.5.r1-05300-8x96.0
Then to do the merge you just have to do
git merge FETCH_HEAD
Now just fix the conflicts if there and then do
git add -A
git merge --continue
Congratulation, you have (probably) succesfully merged a new caf tag.
@TruncatedDinoSour
Copy link

OwO

where was i going with this btw

@HexagonWin
Copy link

People, check here https://wiki.codelinaro.org/en/clo/la/release instead, for older devices here https://wiki.codelinaro.org/en/clo/la/release-backup. CAF is closed now and they all moved to Linaro.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment