Switched to a new branch '20230731121536.934239-1-jens.wiklander@linaro.org'
Applying: xen/arm: ffa: add direct request support
Using index info to reconstruct a base tree...
M	xen/arch/arm/tee/ffa.c
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/arm/tee/ffa.c
CONFLICT (content): Merge conflict in xen/arch/arm/tee/ffa.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 xen/arm: ffa: add direct request support
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".