Switched to a new branch '1557850437-27656-1-git-send-email-rcojocaru@bitdefender.com' Applying: x86/altp2m: move altp2m_get_effective_entry() under CONFIG_HVM error: Failed to merge in the changes. Using index info to reconstruct a base tree... M xen/arch/x86/mm/p2m.c M xen/include/asm-x86/p2m.h Falling back to patching base and 3-way merge... Auto-merging xen/include/asm-x86/p2m.h CONFLICT (content): Merge conflict in xen/include/asm-x86/p2m.h Auto-merging xen/arch/x86/mm/p2m.c Patch failed at 0001 x86/altp2m: move altp2m_get_effective_entry() under CONFIG_HVM 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] x86/altp2m: move altp2m_get_effective_entry() under CONFIG_HVM