[REFERENCE] How to get an Android kernel up to date with linux-stable

nathanchance · Jun 25, 2017

Introduction

Hello everyone! This will be a thread to assist people with getting their device's Android kernel up to date with the latest linux-stable tag from kernel.org. This process will henceforth be referred to as "upstreaming". This thread will assume that you understand how to compile a kernel as well as working with git if you are looking to do this. If you need assistance with that, please refer to one of the following threads (or search for others):

Information

Read through the linux-stable-notes README for all the relevant information!

Custom kernels that are upstreamed

ROMs with upstreamed kernels built in

Receiving help

I am more than happy to answer any questions regarding this process in this thread. You can use the repos I have merged linux-stable into as a reference for solving conflicts and seeing how the merge commit style looks. Additionally, if you feel any information is missing or can be improved upon, please let me know! I want this to be a collaborative effort.

Good luck!

GreekDragon · Jun 25, 2017

DodoGTA · Jun 25, 2017

The Flash said:
/dev/null

Here's a note you should add: Don't "git cherry-pick", "git merge" or "git bisect" during a thunderstorm

Char_G · Jun 25, 2017

Awesome!

nathanchance · Jun 25, 2017

I have clarified on how to know where to start (although it is fairly obvious) in section 1 of the how to.

Sent from my Nexus 6P using XDA Labs

mosimchah · Jun 25, 2017

Thanks for the guide, it's very helpful, also I personally use this command to merge the tags, it's just one command which is nice
git pull https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git -t (tag)

Sent from my LEX727 using XDA Labs

nathanchance · Jun 25, 2017

mosimchah said:
Thanks for the guide, it's very helpful, also I personally use this command to merge the tags, it's just one command which is nice
git pull https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git -t (tag)

Sent from my LEX727 using XDA Labs

Yup, git pull is shorthand for git fetch && git merge, so it's fetching the tag then merging it. Definitely quicker if you are going fast.

To everyone, I have added section 5 and 6 under tips and tricks, going over how to easily get notified of upstream updates and known problem commits to help you in the journey upwards!

ZawZaw · Jun 26, 2017

Thanks Sir @The Flash for your new Guide.
I'm now learning kenel development.
Your guide is very useful.

Thank You very Much.

BTW,
I want to request to use your GitHub's GCC Prebuilt Toolchain Repo for my Nexus5X kernel building.
I want to use this ToolChain Compiler for my Kernel.

Have a permission?
OR
How to request to you?

•••

Sent from my Google Nexus 5X using XDA Labs

thafath · Jun 26, 2017

Thank you very much, well done.

nathanchance · Jun 26, 2017

ZawZaw said:
Thanks Sir @The Flash for your new Guide.
I'm now learning kenel development.
Your guide is very useful.

Thank You very Much.

BTW,
I want to request to use your GitHub's GCC Prebuilt Toolchain Repo for my Nexus5X kernel building.
I want to use this ToolChain Compiler for my Kernel.

Have a permission?
OR
How to request to you?

•••

Sent from my Google Nexus 5X using XDA Labs

Go for it.

ZawZaw · Jun 26, 2017

The Flash said:
Go for it.

Thank You Sir.

•••

Sent from my Google Nexus 5X using XDA Labs

nathanchance · Jun 29, 2017

I am going to start announcing when new kernel versions are available so people don't need to subscribe to the mailing list if they don't want to. So with that:

Linux 3.10.107 (announcement, tree)
Linux 3.18.59 (announcement, tree)
Linux 4.4.75 (announcement, tree)

I have also included a section for publicly available upstreamed kernels so users can choose one if they would like. They'll be broken up by device. Please suggest either your kernel or one you know is up to date, I'll be adding to some I already know of later today.

sscsps · Jul 4, 2017

Hi, Thanks for this wonderful guide, but I have a question which was not quite answered anywhere.
I have a kernel 3.4.5 and i want to upstream it, I did the cherry-pick process and got it to 3.4.112(purposefully not to 113 yet).
My question is how do I use the Merge process?
I did this:

Code:

git merge v3.4.6

on my base 3.4.5 and it create a whole bunch of conflicts(over 30k)

Here is the output of:

Code:

git status > git_status.txt

(I can't upload it to any online paste service as it is 1.84MB file)

Basically, it says this for all the files(I think)

Code:

	both added:      tools/perf/util/ui/progress.h
	both added:      tools/perf/util/ui/setup.c
	both added:      tools/perf/util/ui/ui.h
	both added:      tools/perf/util/ui/util.c
	both added:      tools/perf/util/ui/util.h

Can you tell me how to proceed from here?

nathanchance · Jul 5, 2017

sscsps said:
Hi, Thanks for this wonderful guide, but I have a question which was not quite answered anywhere.
I have a kernel 3.4.5 and i want to upstream it, I did the cherry-pick process and got it to 3.4.112(purposefully not to 113 yet).
My question is how do I use the Merge process?
I did this:

Code:

git merge v3.4.6

on my base 3.4.5 and it create a whole bunch of conflicts(over 30k)

Here is the output of:

Code:

git status > git_status.txt

(I can't upload it to any online paste service as it is 1.84MB file)

Basically, it says this for all the files(I think)

Code:

both added: tools/perf/util/ui/progress.h both added: tools/perf/util/ui/setup.c both added: tools/perf/util/ui/ui.h both added: tools/perf/util/ui/util.c both added: tools/perf/util/ui/util.h

Can you tell me how to proceed from here?

I know we discussed this already but a note has been added to the OP under section 3 regarding merging vs. cherry-picking on a tarball source.

bodafranus · Jul 5, 2017

The Flash said:
6. Commits known to cause runtime or build errors
3.10:

ASoC: compress: Fix compress device direction check - Introduced in 3.10.96, this will break sound altogether.

This commit should solve it:
https://github.com/LineageOS/androi...mmit/104ec98564e210cc1f38647ad98329ad84c3b39e

nathanchance · Jul 5, 2017

bodafranus said:
This commit should solve it:
https://github.com/LineageOS/androi...mmit/104ec98564e210cc1f38647ad98329ad84c3b39e

There's no point in removing just that block because playback is always going to be 1, it won't take the compress route, which defeats the entire purpose of that commit. Reverting is the better option in my opinion.

AhmAdDev99 · Jul 5, 2017

Hi
I know this is not the right place to ask but could you please answer my question.
I want to build kernel for my i9100g - Galaxy SII but i have problem with the compiling.
Tried both Omni And CM.

Every time i compile i get error with initramfs, when i remove initramfs in .config file i can compile without any problem.
I get something like this ..

CHK include/linux/version.h
CHK include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h’ is up to date.
CALL scripts/checksyscalls.sh
CHK include/generated/compile.h
/opt/src/arm/scripts/gen_initramfs_list.sh: Cannot open ‘../initramfs/initramfs.cpio’
make[1]: *** [usr/initramfs_data.cpio.gz] Error 1
make: *** [usr] Error 2
make: *** Waiting for unfinished jobs….

So please help, it's been 2 months i try to fix this problem, But NO LUCK

nathanchance · Jul 5, 2017

@AhmAdDev99 ask in the compilation thread that I have in the OP. I'll tell you right of bat, it is probably a permissions issue because you aren't in your home folder.

To everyone else:

3.18.60 (tree, announcement)
4.4.76 (tree, announcement)

nathanchance · Jul 7, 2017

I am extremely proud to be on a team leading the charge on this mentality: https://plus.google.com/u/0/+DirtyUnicornsOfficial/posts/2MpHCwKqh5J

I have updated the OP with the stable kernel rules, as they will further clear doubts from the detractors.

calebcabob · Jul 7, 2017

Awesome!!! Nice to see one of these! Thanks for taking the time!

[REFERENCE] How to get an Android kernel up to date with linux-stable

Senior Recognized Developer / Contributor

Recognized Developer

Inactive Recognized Developer

Inactive Recognized Contributor

Senior Recognized Developer / Contributor

Senior Member

Senior Recognized Developer / Contributor

Inactive Recognized Developer

Senior Member

Senior Recognized Developer / Contributor

Inactive Recognized Developer

Senior Recognized Developer / Contributor

Senior Member

Senior Recognized Developer / Contributor

bodafranus

Guest

Senior Recognized Developer / Contributor

Senior Member

Senior Recognized Developer / Contributor

Senior Recognized Developer / Contributor

Senior Member

Similar threads

Top Liked Posts