How to upgrade kernel

[faxiang1230]

Sorry - just a maintain issue. I have a kernel 4.4-10 and patch some code.Then I want to upgrade to 4.10. I do like the following:

git fetch https://github.com/maurossi/linux.git
git branch -a 

......
  remotes/github/kernel-4.10
  remotes/github/kernel-4.10_merge_ia   //I want to try with this branch
......

git merge remotes/github/kernel-4.10_merge_ia
git status .

I see that many conflict files,so I think this method is wrong.
Could you share the method that how you upgrade the kernel? wangjianxing5210@163.com

[faxiang1230]

Maybe I should do like the following:

git format-patch -M HEAD 4.4-10_HEAD
mv *.patch  /home/xxx/
git checkout remotes/github/kernel-4.10_merge_ia -b 4.10_ia
git am /home/xxx/*.patch

PS:I don't patch too many code on 4.4-10.

[maurossi]

Hi Jianxing,

2017-04-12 4:34 GMT+02:00 Jianxing Wang notifications@github.com:

Sorry - just a maintain issue. I have a kernel 4.4-10 and patch some code.Then I want to upgrade to 4.10. I do like the following:

git fetch https://github.com/maurossi/linux.git git branch -a

...... remotes/github/kernel-4.10 remotes/github/kernel-4.10_merge_ia //I want to try with this branch ......

git merge remotes/github/kernel-4.10_merge_ia git status .

I see that many conflict files,so I think this method is wrong. Could you share the method that how you upgrade the kernel? wangjianxing5210@163.com

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/maurossi/linux/issues/4, or mute the thread https://github.com/notifications/unsubscribe-auth/AH9VlD8_KljEZCULy0S8WMZyr-dEYD1gks5rvDhRgaJpZM4M64NH .

In the kernel_4.10_merge_ia the merge of android-ia (based on kernel 4.10) was performed on my kernel_4.10 branch (which has the minimal changes to support Android plus some new staging wifi drivers)

Merging a 4.10 based branch on 4.4.x kernel will indeed cause a very large number of conflicts, but it's not even worth trying, considering that there are 4.10 based branches

For a single patch, you can use git cherry-pick [commit] and you'll just have to resolve your patch conflicts (step which is anyway necessary) Mauro

[faxiang1230]

Thanks for your help.

it's not even worth trying, considering that there are 4.10 based branches I agree with you. For a single patch, you can use git cherry-pick [commit] and you'll just have to resolve your patch conflicts (step which is anyway necessary) Yeah,I do like this,it's more convenient. Jianxing.Wang

[maurossi]

Hi, looking at android-ia kernel, they reverted master to 4.9 which is Long term supported, so the procedure worth trying is now:

git fetch maurossi kernel-4.9 git check out FETCH_HEAD

then fetch and rebase on current android-ia master M.

Il 09/mag/2017 11:14, "Jianxing Wang" notifications@github.com ha scritto:

Thanks for your help.

it's not even worth trying, considering that there are 4.10 based branches I agree with you. For a single patch, you can use git cherry-pick [commit] and you'll just have to resolve your patch conflicts (step which is anyway necessary) Yeah,I do like this,it's more convenient. Jianxing.Wang

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/maurossi/linux/issues/4#issuecomment-300107495, or mute the thread https://github.com/notifications/unsubscribe-auth/AH9VlJtI5v-8KYJ4Htpec4ZD9lO1CqEWks5r4C6QgaJpZM4M64NH .

[faxiang1230]

they reverted master to 4.9 which is Long term supported
I got it.

git fetch maurossi git rebase -i remotes/maurossi/kernel-4.10_merge_ia remotes/maurossi/kernel-4.9 A kernel-4.9 / D---E---F---G kernel-4.10_merge_ia \ D is kernel-4.9 rc0 Yeah,the conflict is less. I understand that:diff(kernel-4.9-latest - kernel-4.9-rc0) < diff(kernel-4.10 - kernel-4.9-rc0). But with the time increasing,it will reverse(Aha,Intlel will rebase it,too).

Now I fetch kernel LTS version:your linux and https://zh.osdn.net/projects/android-x86/scm/git/kernel/branches

thank you.

[maurossi]

2017-05-09 13:28 GMT+02:00 Jianxing Wang notifications@github.com:

they reverted master to 4.9 which is Long term supported I got it.

git fetch maurossi git rebase -i remotes/maurossi/kernel-4.10_merge_ia remotes/maurossi/kernel-4.9 A kernel-4.9 / D---E---F---G kernel-4.10_merge_ia

D is kernel-4.9 rc0 Yeah,the conflict is less. I understand that:diff(kernel-4.9-latest - kernel-4.9-rc0) < diff(kernel-4.10 - kernel-4.9-rc0). But with the time increasing,it will reverse(Aha,Intlel will rebase it,too).

Now I fetch kernel LTS version:your linux and https://zh.osdn.net/projects/android-x86/scm/git/kernel/branches

thank you.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/maurossi/linux/issues/4#issuecomment-300135678, or mute the thread https://github.com/notifications/unsubscribe-auth/AH9VlDZ3wUC1vrXTzc1yOz8gLdeWyn3aks5r4E3DgaJpZM4M64NH .

Sorry I made a mistake, as my has always been a merge of android-ia in my kernel version.

android-ia kernel has already rebased (back) on kernel-4.9 stable, but for androd-x86 to work you need the base minimum patches, which you can see here:

https://github.com/maurossi/linux/commits/kernel-4.9

So the corrected proprocedure (the same that I applied for kernel-4.10_merge-ia) if for you to fetch&checkout my kernel-4.9 and then fetch & merge android-ia master.

Sorry what I have descibed to you was different, even if should work, if you see a building error it may be due to duplication of two different versions of "shmem: enable user xattr for tmpfs https://github.com/maurossi/linux/commit/18e01f13f1bd30c9db125e666df852c5d4859e8a "

If see building error just revert one of them, e.g. git revert 18e01f1 in my kernel-4.9 branch

Mauro

[faxiang1230]

I just rebase it,android-ia+linux-4.9.27+maurossi-4.9 https://github.com/faxiang1230/linux/tree/android_ia-linux_4.9-maurossi_4.9 But meet some error while compiling,finding the reason...

  DATAREL arch/x86/boot/compressed/vmlinux
Kernel: arch/x86/boot/bzImage is ready  (#1)
ERROR: "memset" [drivers/staging/rtl8812au/r8812au.ko] undefined!
ERROR: "memcpy" [drivers/staging/rtl8812au/r8812au.ko] undefined!
ERROR: "memset" [drivers/staging/rtl8723bu/8723bu.ko] undefined!
ERROR: "memcpy" [drivers/staging/rtl8723bu/8723bu.ko] undefined!
ERROR: "memset" [drivers/staging/rtl8723bs/r8723bs.ko] undefined!
ERROR: "memcpy" [drivers/staging/rtl8723bs/r8723bs.ko] undefined!
ERROR: "memset" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "memcpy" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "drm_global_mutex" [drivers/gpu/drm/i915/i915.ko] undefined!
ERROR: "access_process_vm" [drivers/gpu/drm/i915/i915.ko] undefined!
make[3]: *** [__modpost] Error 1
make[2]: *** [modules] Error 2

Jianxing.Wang

[faxiang1230]

I think the commit:fc2cec2154710e24a119daaec94d1a29a01deb36 has some error,it won't export lib.a symbol ,so some drivers which use memset or memcpy can't find the symbols. fc2cec2154710e24a119daaec94d1a29a01deb36 Conflict in scripts/Makefile.build was resoved manually

scripts/Makefile.build

You should resolved manually again.

[maurossi]

The wireless drivers added in staging are not essential, now I remembered that Chih-Wei has mantained x86 kernel-4.9 which is not just minimal

The defconfig files were also slightly different, the version in main repo is more update/stable/tested M.

Il giovedì 11 maggio 2017, Jianxing Wang <notifications@github.com javascript:_e(%7B%7D,'cvml','notifications@github.com');> ha scritto:

I think the commit:fc2cec2154710e24a119daaec94d1a29a01deb36 has some error,it won't export lib.a symbol ,so some drivers which use memset or memcpy can't find the symbols. fc2cec2 https://github.com/maurossi/linux/commit/fc2cec2154710e24a119daaec94d1a29a01deb36 Conflict in scripts/Makefile.build was resoved manually

scripts/Makefile.build

You should resolved manually again.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/maurossi/linux/issues/4#issuecomment-300666272, or mute the thread https://github.com/notifications/unsubscribe-auth/AH9VlJgJnAMb17aGJwCfO6Um-bEx3kdWks5r4nQIgaJpZM4M64NH .