Switched to a new branch '20240313122454.965566-1-george.dunlap@cloud.com'
Applying: x86: Move SVM features exposed to guest into hvm_max_cpu_policy
.git/rebase-apply/patch:36: trailing whitespace.
    /* 
.git/rebase-apply/patch:52: trailing whitespace.
    
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	xen/arch/x86/cpu-policy.c
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/x86/cpu-policy.c
CONFLICT (content): Merge conflict in xen/arch/x86/cpu-policy.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 x86: Move SVM features exposed to guest into hvm_max_cpu_policy
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".