Hi Christophe,
Thanks for your answer but I think I don't know how it works with the
cherry-pick.
$ git bisect start
$ git bisect good 68a32ba14177d4a21c4a9a941cf1d7aea86d436f
$ git bisect bad c70a4be130de333ea079c59da41cc959712bb01c
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?
Thanks,
Christian
On 04 May 2021 at 06:56 am, Christophe Leroy wrote:
Le 04/05/2021 à 00:25, Christian Zigotzky a écrit :
Hello,
Xorg always restarts again and again after the the PowerPC updates
5.13-1 [1] on my FSL P5040 Cyrus+ board (A-EON AmigaOne X5000) [2].
Xorg doesn't start anymore in a virtual e5500 QEMU machine [3].
I bisected today [4].
Result: powerpc/signal32: Convert do_setcontext[_tm]() to user access
block (887f3ceb51cd34109ac17bfc98695162e299e657) [5] is the first bad
commit.
Please find attached the kernel config.
Please check the first bad commit.
I'm not sure you can conclude anything here. There is a problem in
that commit, but it is fixed by 525642624783 ("powerpc/signal32: Fix
erroneous SIGSEGV on RT signal return") which is the last commit of
powerpc-5.13-1.
So any bisect from there will for sure point to 887f3ceb51cd
("powerpc/signal32: Convert do_setcontext[_tm]() to user access
block") but that's unconclusive. If the problem is still there at the
HEAD of powerpc-5.13-1, the problem is likely somewhere else.
I think you need to do the bisect again with a cherry-pick of
525642624783 at each step.
Thanks
Christophe
Thanks,
Christian
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c70a4be130de333ea079c59da41cc959712bb01c
[2] http://wiki.amiga.org/index.php?title=X5000
[3] qemu-system-ppc64 -M ppce500 -cpu e5500 -m 1024 -kernel uImage
-drive format=raw,file=fedora28-2.img,index=0,if=virtio -netdev
user,id=mynet0 -device virtio-net-pci,netdev=mynet0 -append "rw
root=/dev/vda" -device virtio-vga -usb -device usb-ehci,id=ehci
-device usb-tablet -device virtio-keyboard-pci -smp 4 -vnc :1
[4]
https://forum.hyperion-entertainment.com/viewtopic.php?p=53101#p53101
[5]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=887f3ceb51cd34109ac17bfc98695162e299e657
