Skip to content

Instantly share code, notes, and snippets.

@divyam234
Forked from libxzr/How to merge latest caf tag
Last active August 6, 2021 14:04
Show Gist options
  • Save divyam234/1e5532a1b9f7848d5907389328c673e1 to your computer and use it in GitHub Desktop.
Save divyam234/1e5532a1b9f7848d5907389328c673e1 to your computer and use it in GitHub Desktop.
CAF upstream
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.
https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0
https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment