Switched to a new branch '20241031085233.425388-1-tao1.su@linux.intel.com'
Applying: target/i386: cpu: set correct supported XCR0 features for TCG
Using index info to reconstruct a base tree...
M	target/i386/cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/i386/cpu.c
No changes -- Patch already applied.
Applying: target/i386: do not rely on ExtSaveArea for accelerator-supported XCR0 bits
Using index info to reconstruct a base tree...
M	target/i386/cpu.c
M	target/i386/kvm/kvm-cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/i386/kvm/kvm-cpu.c
Auto-merging target/i386/cpu.c
CONFLICT (content): Merge conflict in target/i386/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 0002 target/i386: do not rely on ExtSaveArea for accelerator-supported XCR0 bits
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".