Switched to a new branch '20260522000324.23255-1-alistair.francis@wdc.com'
Applying: target/riscv: Remove spike as default machine
Using index info to reconstruct a base tree...
M	docs/about/deprecated.rst
M	docs/about/removed-features.rst
M	hw/riscv/spike.c
Falling back to patching base and 3-way merge...
Auto-merging docs/about/deprecated.rst
CONFLICT (content): Merge conflict in docs/about/deprecated.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 target/riscv: Remove spike as default machine
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".