Switched to a new branch '20241126171235.362916-1-npiggin@gmail.com'
Applying: target/ppc: Fix non-maskable interrupt while halted
Using index info to reconstruct a base tree...
M	target/ppc/excp_helper.c
Falling back to patching base and 3-way merge...
Auto-merging target/ppc/excp_helper.c
No changes -- Patch already applied.
Applying: ppc/pnv: Fix direct controls quiesce
Using index info to reconstruct a base tree...
M	hw/ppc/pnv_core.c
M	target/ppc/cpu.h
Falling back to patching base and 3-way merge...
Auto-merging target/ppc/cpu.h
CONFLICT (content): Merge conflict in target/ppc/cpu.h
Auto-merging hw/ppc/pnv_core.c
CONFLICT (content): Merge conflict in hw/ppc/pnv_core.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 ppc/pnv: Fix direct controls quiesce
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".