Switched to a new branch '20221115132657.97864-1-roger.pau@citrix.com'
Applying: amd/virt_ssbd: set SSBD at vCPU context switch
Using index info to reconstruct a base tree...
M	docs/misc/xen-command-line.pandoc
M	xen/arch/x86/cpu/amd.c
M	xen/arch/x86/hvm/svm/entry.S
M	xen/arch/x86/hvm/svm/svm.c
M	xen/arch/x86/include/asm/msr.h
M	xen/arch/x86/msr.c
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/x86/include/asm/msr.h
CONFLICT (content): Merge conflict in xen/arch/x86/include/asm/msr.h
Auto-merging xen/arch/x86/cpu/amd.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 amd/virt_ssbd: set SSBD at vCPU context switch
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".