[FSL P50x0] Xorg always restarts again and again after the the PowerPC updates 5.13-1

Christophe Leroy christophe.leroy at csgroup.eu
Tue May 4 17:47:41 AEST 2021


Le 04/05/2021 à 09:21, Christian Zigotzky a écrit :
> Hi Christophe,
> Thanks for your answer but I think I don't know how it works with the cherry-pick.
> $ git bisect start

As you suspect the problem to be specific to powerpc, I can do

git bisect start -- arch/powerpc

> $ git bisect good 68a32ba14177d4a21c4a9a941cf1d7aea86d436f
> $ git bisect bad c70a4be130de333ea079c59da41cc959712bb01c

You said that powerpc-5.13-1 is bad so you can narrow the search I think:

git bisect bad powerpc-5.13-1
git bisect good 887f3ceb51cd3~

> Bisecting: 2462 revisions left to test after this (roughly 11 steps)
> [47a6959fa331fe892a4fc3b48ca08e92045c6bda] netfilter: allow to turn off xtables compat layer
> $ git cherry-pick 525642624783
> error: could not apply 525642624783... powerpc/signal32: Fix erroneous SIGSEGV on RT signal return
> hint: after resolving the conflicts, mark the corrected paths
> hint: with 'git add <paths>' or 'git rm <paths>'
> hint: and commit the result with 'git commit'
> How can I fix this error?

This problably means that the step is at a commit which is prior to the first bad commit you 
identified at previous step. If you narrow the bisect as explained above, it shouldn't happen unless 
git decides it needs to descend a branch to a merge point. In that case just do 'git cherry-pick 
--abort" and go without the fix.

Note that once you have cherry picked the fix and tested the result, you have to apply the result to 
HEAD~ (the commit before the cherry-pick).
- git bisect good HEAD~
- git bisect bad HEAD~


More information about the Linuxppc-dev mailing list