Switched to a new branch 'cover.1778140240.git.oleksii.kurochko@gmail.com'
Applying: xen: arm: fix len type for guest copy functions
Using index info to reconstruct a base tree...
M	xen/arch/arm/guestcopy.c
M	xen/arch/arm/include/asm/guest_access.h
M	xen/include/xen/fdt-domain-build.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: xen/dom0less: rename kernel_zimage_probe() to kernel_image_probe()
Using index info to reconstruct a base tree...
M	xen/arch/arm/kernel.c
M	xen/common/device-tree/kernel.c
M	xen/include/xen/fdt-kernel.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: xen: move declaration of fw_unreserved_regions() to common header
Using index info to reconstruct a base tree...
M	xen/arch/arm/include/asm/setup.h
M	xen/include/xen/bootinfo.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: xen: introduce domain-layout.h with common domain_use_host_layout()
Using index info to reconstruct a base tree...
M	xen/arch/arm/domain_build.c
M	xen/arch/arm/include/asm/domain.h
M	xen/arch/arm/vgic-v3.c
M	xen/arch/riscv/include/asm/paging.h
M	xen/common/device-tree/domain-build.c
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/arm/include/asm/domain.h
Auto-merging xen/common/device-tree/domain-build.c
No changes -- Patch already applied.
Applying: xen/device-tree: use p2m_gpa_bits in common code
Using index info to reconstruct a base tree...
M	xen/arch/arm/include/asm/p2m.h
M	xen/common/device-tree/domain-build.c
Falling back to patching base and 3-way merge...
Auto-merging xen/arch/arm/include/asm/p2m.h
CONFLICT (content): Merge conflict in xen/arch/arm/include/asm/p2m.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 0005 xen/device-tree: use p2m_gpa_bits in common code