Switched to a new branch '20260220214653.3497384-1-andrew.cooper3@citrix.com'
Applying: arm: Use __func__ in acpi_boot_table_init()
Using index info to reconstruct a base tree...
M	xen/arch/arm/acpi/boot.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: xen/treewide: Adjust suffixes on integer literals
Using index info to reconstruct a base tree...
M	xen/arch/arm/gic-v3-its.c
M	xen/arch/arm/include/asm/tee/optee_msg.h
M	xen/arch/arm/include/asm/tee/optee_smc.h
M	xen/arch/arm/tee/optee.c
M	xen/arch/x86/guest/xen/xen.c
M	xen/arch/x86/include/asm/config.h
M	xen/arch/x86/include/asm/guest/hyperv.h
M	xen/arch/x86/pv/emul-gate-op.c
M	xen/arch/x86/tboot.c
M	xen/drivers/char/xhci-dbc.c
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/arm/tee/optee.c
Auto-merging xen/arch/x86/pv/emul-gate-op.c
Auto-merging xen/arch/x86/tboot.c
No changes -- Patch already applied.
Applying: xen/argo: Fix MISRA violations around function parameters
Applying: xen/treewide: Adjust parameter names and types
Using index info to reconstruct a base tree...
M	xen/arch/arm/include/asm/pci.h
M	xen/arch/arm/pci/pci-access.c
M	xen/arch/x86/include/asm/compat.h
M	xen/arch/x86/include/asm/p2m.h
M	xen/arch/x86/mm/mem_paging.c
M	xen/crypto/vmac.c
M	xen/include/crypto/rijndael.h
M	xen/include/xen/acpi.h
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/arm/pci/pci-access.c
Auto-merging xen/arch/x86/include/asm/p2m.h
Auto-merging xen/arch/x86/mm/mem_paging.c
Auto-merging xen/crypto/vmac.c
Auto-merging xen/include/crypto/rijndael.h
CONFLICT (content): Merge conflict in xen/include/crypto/rijndael.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 set advice.mergeConflict false"
Patch failed at 0004 xen/treewide: Adjust parameter names and types