Switched to a new branch '20251230135050.188191-1-andrew.cooper3@citrix.com'
Applying: xen: Fix endian handling in muldiv64.c
Using index info to reconstruct a base tree...
M	xen/lib/muldiv64.c
Falling back to patching base and 3-way merge...
Auto-merging xen/lib/muldiv64.c
No changes -- Patch already applied.
Applying: arm/time: Sort headers
Using index info to reconstruct a base tree...
M	xen/arch/arm/time.c
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/arm/time.c
CONFLICT (content): Merge conflict in xen/arch/arm/time.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 0002 arm/time: Sort headers