How to merge a newer CAF tag in an android kernel (For msm kernel)

gistfile1.txt

For msm
Go into your kernel folder with a terminal and do

    git fetch https://source.codeaurora.org/quic/la/kernel/msm-xxx/ LA.UM.x.x.rx-0XXXX-xxxxxx.x
    
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 add .
    git merge --continue              or       git commit
    
Congratulation, you have fucked up your kernel.

-----------------------------------------------------------------------------------------------------------------------------
For WLAN modules
Go into your kernel folder with a terminal and do

git remote add xxx URL

Then

git subtree add --prefix drivers/staging/xxx xxx TAG