Switched to a new branch '20251218151728.28339-1-roger.pau@citrix.com'
Applying: libs/xg: allow caller to provide extra memflags for populate physmap
Using index info to reconstruct a base tree...
M	tools/include/xenguest.h
M	tools/libs/guest/xg_dom_x86.c
M	tools/libs/guest/xg_nomigrate.c
M	tools/libs/guest/xg_sr_common.h
M	tools/libs/guest/xg_sr_restore.c
M	tools/libs/light/libxl_save_helper.c
Falling back to patching base and 3-way merge...
Auto-merging tools/libs/guest/xg_dom_x86.c
CONFLICT (content): Merge conflict in tools/libs/guest/xg_dom_x86.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 libs/xg: allow caller to provide extra memflags for populate physmap