Switched to a new branch '20250704111207.591994-1-alistair.francis@wdc.com'
Applying: target/riscv: Add the checking into stimecmp write function.
Using index info to reconstruct a base tree...
M	target/riscv/time_helper.c
Falling back to patching base and 3-way merge...
Auto-merging target/riscv/time_helper.c
No changes -- Patch already applied.
Applying: hw/intc: riscv_aclint: Fix mtime write for sstc extension
Using index info to reconstruct a base tree...
M	hw/intc/riscv_aclint.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: target/riscv: Fix VSTIP bit in sstc extension.
Using index info to reconstruct a base tree...
M	target/riscv/csr.c
Falling back to patching base and 3-way merge...
Auto-merging target/riscv/csr.c
No changes -- Patch already applied.
Applying: target/riscv: Enable/Disable S/VS-mode Timer when STCE bit is changed
Using index info to reconstruct a base tree...
M	target/riscv/csr.c
M	target/riscv/time_helper.c
M	target/riscv/time_helper.h
Falling back to patching base and 3-way merge...
Auto-merging target/riscv/csr.c
No changes -- Patch already applied.
Applying: target/riscv/cpu.c: fix zama16b order in isa_edata_arr[]
Using index info to reconstruct a base tree...
M	target/riscv/cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/riscv/cpu.c
No changes -- Patch already applied.
Applying: target/riscv/tcg: restrict satp_mode changes in cpu_set_profile
Using index info to reconstruct a base tree...
M	target/riscv/tcg/tcg-cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/riscv/tcg/tcg-cpu.c
CONFLICT (content): Merge conflict in target/riscv/tcg/tcg-cpu.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0006 target/riscv/tcg: restrict satp_mode changes in cpu_set_profile
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".