[Intel-gfx] ✗ Fi.CI.BUILD: failure for KVM: Remove uses of struct page from x86 and arm64 MMU (rev3)

Patchwork
2021-06-24T16:07:32Z

== Series Details ==

Series: KVM: Remove uses of struct page from x86 and arm64 MMU (rev3)
URL : https://patchwork.freedesktop.org/series/91836/
State : failure

== Summary ==

Applying: KVM: Remove uses of struct page from x86 and arm64 MMU
Applying: KVM: mmu: also return page from gfn_to_pfn
Using index info to reconstruct a base tree...
M arch/powerpc/kvm/book3s_64_mmu_hv.c
M arch/x86/kvm/mmu/mmu_audit.c
M arch/x86/kvm/x86.c
M drivers/gpu/drm/i915/gvt/kvmgt.c
M virt/kvm/kvm_main.c
Falling back to patching base and 3-way merge...
Auto-merging virt/kvm/kvm_main.c
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/kvm/mmu/mmu_audit.c
Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 KVM: mmu: also return page from gfn_to_pfn
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".