Switched to a new branch '20240928100450.1666-1-phil@philjordan.eu'
Applying: i386/hvf: Integrates x2APIC support with hvf accel
Using index info to reconstruct a base tree...
M	target/i386/hvf/x86_cpuid.c
A	target/i386/hvf/x86_emu.c
Falling back to patching base and 3-way merge...
Auto-merging target/i386/hvf/x86_cpuid.c
CONFLICT (content): Merge conflict in target/i386/hvf/x86_cpuid.c
Auto-merging target/i386/emulate/x86_emu.c
CONFLICT (content): Merge conflict in target/i386/emulate/x86_emu.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 i386/hvf: Integrates x2APIC support with hvf accel
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".