Switched to a new branch '20241028182037.290171-1-dbarboza@ventanamicro.com'
Applying: target/riscv/kvm: set 'aia_mode' to default in error path
Using index info to reconstruct a base tree...
M	target/riscv/kvm/kvm-cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/riscv/kvm/kvm-cpu.c
CONFLICT (content): Merge conflict in target/riscv/kvm/kvm-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 0001 target/riscv/kvm: set 'aia_mode' to default in error path
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".