Switched to a new branch 'cover.1766399205.git.oleksii.kurochko@gmail.com'
Applying: xen/riscv: introduce vSBI extension framework
Using index info to reconstruct a base tree...
M	xen/arch/riscv/Makefile
M	xen/arch/riscv/entry.S
M	xen/arch/riscv/include/asm/processor.h
M	xen/arch/riscv/riscv64/asm-offsets.c
M	xen/arch/riscv/setup.c
M	xen/arch/riscv/traps.c
M	xen/arch/riscv/xen.lds.S
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/riscv/vsbi/Makefile
CONFLICT (add/add): Merge conflict in xen/arch/riscv/vsbi/Makefile
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/riscv: introduce vSBI extension framework