Switched to a new branch '20260107175605.56617-1-roger.pau@citrix.com'
Applying: xen/mm: move adjustment of claimed pages counters on allocation
Using index info to reconstruct a base tree...
M	xen/common/page_alloc.c
M	xen/include/xen/sched.h
Falling back to patching base and 3-way merge...
Auto-merging xen/common/page_alloc.c
CONFLICT (content): Merge conflict in xen/common/page_alloc.c
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 set advice.mergeConflict false"
Patch failed at 0001 xen/mm: move adjustment of claimed pages counters on allocation