Switched to a new branch '20240726152206.28411-1-roger.pau@citrix.com'
Applying: x86/mm: drop l{1,2,3,4}e_write_atomic()
Using index info to reconstruct a base tree...
M	xen/arch/x86/include/asm/page.h
M	xen/arch/x86/include/asm/x86_64/page.h
M	xen/arch/x86/mm.c
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/x86/mm.c
Auto-merging xen/arch/x86/include/asm/x86_64/page.h
CONFLICT (content): Merge conflict in xen/arch/x86/include/asm/x86_64/page.h
Auto-merging xen/arch/x86/include/asm/page.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 x86/mm: drop l{1,2,3,4}e_write_atomic()