Switched to a new branch '20240930124831.54232-1-philmd@linaro.org'
Applying: hw/riscv/spike: Replace tswap64() by ldq_endian_p()
Using index info to reconstruct a base tree...
M	hw/char/riscv_htif.c
M	hw/riscv/spike.c
M	include/hw/char/riscv_htif.h
Falling back to patching base and 3-way merge...
Auto-merging include/hw/char/riscv_htif.h
Auto-merging hw/riscv/spike.c
Auto-merging hw/char/riscv_htif.c
CONFLICT (content): Merge conflict in hw/char/riscv_htif.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 hw/riscv/spike: Replace tswap64() by ldq_endian_p()
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".