Switched to a new branch '20190514122456.28559-1-julien.grall@arm.com'
Applying: xen/const: Extend the existing macro BIT to take a suffix in parameter
Using index info to reconstruct a base tree...
M	xen/arch/arm/arm32/insn.c
M	xen/arch/arm/arm64/insn.c
M	xen/arch/arm/gic-v3-its.c
M	xen/arch/arm/gic-v3-lpi.c
M	xen/arch/arm/guest_walk.c
M	xen/arch/arm/vgic-v3-its.c
M	xen/arch/arm/vgic-v3.c
M	xen/arch/arm/vgic.c
M	xen/drivers/char/meson-uart.c
M	xen/drivers/char/mvebu-uart.c
M	xen/include/asm-arm/bitops.h
M	xen/include/asm-arm/gic_v3_defs.h
M	xen/include/asm-arm/gic_v3_its.h
M	xen/include/xen/const.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: xen/arm: Rename SCTLR_* defines and remove unused one
error: sha1 information is lacking or useless (xen/arch/arm/mm.c).
error: could not build fake ancestor
Patch failed at 0001 xen/arm: Rename SCTLR_* defines and remove unused one
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Failed to apply patch:
[Xen-devel] [PATCH MM-PART2 RESEND v2 02/19] xen/arm: Rename SCTLR_* defines and remove unused one