[Galaxy S6 General] The Sickness:
HOW TO CHERRY PICK COMMITS

This part of the guide isnt really that hard to understand. You just need to make sure what you pick will work on your kernel......I advise for you

to pick from the same device. If your building for the G920T, you need to pick from the S6.....Please note that it doesnt matter if the commit is

2 weeks old or 2 years. In another words, firmware isnt a factor. Your stock source is what is from the latest firmware. The kernel code is many

years old....its just improved over time. So lets get started......

First question.....where would you cherry pick from? Well Github is the answer. So to make this easy will will use my Twisted Kernel source.

Go to here. Now in your kernel source open a terminal.....

What we need to do is "fetch" my source......its a remote hook up you might say. So on the web page click the green tab that says

Clone or download, then click on the clipboard icon.......go to your terminal and type: git fetch (paste url you just copied), hit enter. It will set

up a remote hook. Once its done you can pick any or all of my commits.

A point to remember, you ALWAYS pick from the oldest to newest, unless you commit each pick you make. So, let me show you how. On the Github page

on the left side it says 388 commits, select it. It will now bring up all the commits. Scroll to the bottom of the page and select older.....keep doing that until

you reach the end.....so you should be here......

Now, what you really need to do is read the commit BEFORE you pick it. Most have a description, and some dont. But, everyone wants a "permissive" kernel.

So, the commit that says Set kernel to "permissive" is our first one. To the far right of the commit is a clipboard icon, click it......now in your terminal

type: git cherry-pick (paste from the clipboard) then hit enter. It will look like this when its done

Now we need to commit the cherry-pick we just made. So in your terminal type: git push origin master......then your username, then your password.

When its done it will look like this

Now, lets say you made a cherry-pick and you get this error.......

When you get this error there is a problem with the commit. So in your terminal type: git status.......and it will look like this after

So what we need to do is find out what the issue is. 99.9% of the time its a "HEAD" issue......which is the case here. So, go to block/Kconfig.iosched...thats the first issue.

Open it with your text editor. Look at line 35, 36, and 119. Those NEED to be deleted

Now go to block/Makefile... you can see here that you need to delete lines 18, 19, and 28.

Now once you have fixed those errors you need to commit it. To do that you need to copy the folder location like this.....

Then once you have it copied you will need to type: git add (paste it here)...then it will look like this

Now do the same to the other...it will look like this

Now we need to commit those changes. Type: git commit.........it will look like this

Now you will notice that the commit message is already there....so there is no need to change it. So now we need to commit. To do that

you need to select Ctlr+o.........then enter.........Ctlr+x...............and it will look like this

Then in your terminal type: git push origin master........then your username..then your password. Then take a look at your Github

page and you will see the commit appear.

That covers basic cherry-pick..........