Switched to a new branch '20260529215119.73244-1-deller@gmx.de'
Applying: linux-user/ppc: restore fp_status from FPSCR on sigreturn
Using index info to reconstruct a base tree...
M	linux-user/ppc/signal.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: linux-user/mips: save/restore FCSR across signal delivery
Using index info to reconstruct a base tree...
M	linux-user/mips/signal.c
M	target/mips/cpu.h
M	target/mips/fpu.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: linux-user/sh4: preserve T/M/Q bits across signal delivery
Using index info to reconstruct a base tree...
M	linux-user/sh4/signal.c
M	tests/tcg/sh4/Makefile.target
Falling back to patching base and 3-way merge...
Auto-merging linux-user/sh4/signal.c
No changes -- Patch already applied.
Applying: linux-user/sh4: restore FP rounding mode on sigreturn
Using index info to reconstruct a base tree...
M	linux-user/sh4/signal.c
M	target/sh4/cpu.h
M	target/sh4/op_helper.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: target/sh4: sync fp_status when gdb writes FPSCR
Using index info to reconstruct a base tree...
M	target/sh4/gdbstub.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: linux-user/s390x: restore fpu_status rounding mode from FPC on sigreturn
Using index info to reconstruct a base tree...
M	linux-user/s390x/signal.c
M	target/s390x/cpu.h
M	target/s390x/tcg/fpu_helper.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: linux-user: Implement finer grained madivse() syscall
Using index info to reconstruct a base tree...
M	linux-user/mmap.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: linux-user: Fix typo in function documentation for pgb_addr_set()
Using index info to reconstruct a base tree...
M	linux-user/elfload.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: linux-user: Move init_main_thread() prototype to user-internals.h
Using index info to reconstruct a base tree...
M	linux-user/qemu.h
M	linux-user/user-internals.h
Falling back to patching base and 3-way merge...
Auto-merging linux-user/user-internals.h
CONFLICT (content): Merge conflict in linux-user/user-internals.h
Auto-merging linux-user/qemu.h
CONFLICT (content): Merge conflict in linux-user/qemu.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 linux-user: Move init_main_thread() prototype to user-internals.h
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".