Switched to a new branch '20241001092910.1030913-1-harshpb@linux.ibm.com'
Applying: ppc/spapr: remove deprecated machine pseries-2.1
Using index info to reconstruct a base tree...
M	hw/ppc/spapr.c
Falling back to patching base and 3-way merge...
Auto-merging hw/ppc/spapr.c
CONFLICT (content): Merge conflict in hw/ppc/spapr.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 ppc/spapr: remove deprecated machine pseries-2.1
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".