From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Nicholas Piggin" <npiggin@gmail.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for KVM: Remove uses of struct page from x86 and arm64 MMU (rev3)
Date: Thu, 24 Jun 2021 16:07:31 -0000 [thread overview]
Message-ID: <162455085102.1853.13788626720820759746@emeril.freedesktop.org> (raw)
In-Reply-To: <20210624035749.4054934-1-stevensd@google.com>
== 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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2021-06-24 16:07 UTC|newest]
Thread overview: 213+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 3:57 [PATCH 0/6] KVM: Remove uses of struct page from x86 and arm64 MMU David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [Intel-gfx] " David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [PATCH 1/6] KVM: x86/mmu: release audited pfns David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [Intel-gfx] " David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 8:43 ` Nicholas Piggin
2021-06-24 8:43 ` Nicholas Piggin
2021-06-24 8:43 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 8:43 ` Nicholas Piggin
2021-06-24 8:43 ` Nicholas Piggin
2021-06-24 8:43 ` Nicholas Piggin
2021-06-24 9:43 ` Paolo Bonzini
2021-06-24 9:43 ` Paolo Bonzini
2021-06-24 9:43 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 9:43 ` Paolo Bonzini
2021-06-24 9:43 ` Paolo Bonzini
2021-06-24 9:43 ` Paolo Bonzini
2021-06-24 15:36 ` Sean Christopherson
2021-06-24 15:36 ` [Intel-gfx] " Sean Christopherson
2021-06-24 15:36 ` Sean Christopherson
2021-06-24 15:36 ` Sean Christopherson
2021-06-24 15:36 ` Sean Christopherson
2021-06-24 15:36 ` Sean Christopherson
2021-06-24 3:57 ` [PATCH 2/6] KVM: mmu: also return page from gfn_to_pfn David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [Intel-gfx] " David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 8:52 ` Nicholas Piggin
2021-06-24 8:52 ` Nicholas Piggin
2021-06-24 8:52 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 8:52 ` Nicholas Piggin
2021-06-24 8:52 ` Nicholas Piggin
2021-06-24 8:52 ` Nicholas Piggin
2021-06-24 9:42 ` Paolo Bonzini
2021-06-24 9:42 ` Paolo Bonzini
2021-06-24 9:42 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 9:42 ` Paolo Bonzini
2021-06-24 9:42 ` Paolo Bonzini
2021-06-24 9:42 ` Paolo Bonzini
2021-06-24 9:57 ` Nicholas Piggin
2021-06-24 9:57 ` Nicholas Piggin
2021-06-24 9:57 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 9:57 ` Nicholas Piggin
2021-06-24 9:57 ` Nicholas Piggin
2021-06-24 9:57 ` Nicholas Piggin
2021-06-24 10:13 ` Paolo Bonzini
2021-06-24 10:13 ` Paolo Bonzini
2021-06-24 10:13 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 10:13 ` Paolo Bonzini
2021-06-24 10:13 ` Paolo Bonzini
2021-06-24 10:13 ` Paolo Bonzini
2021-06-24 10:17 ` Nicholas Piggin
2021-06-24 10:17 ` Nicholas Piggin
2021-06-24 10:17 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 10:17 ` Nicholas Piggin
2021-06-24 10:17 ` Nicholas Piggin
2021-06-24 10:17 ` Nicholas Piggin
2021-06-24 10:21 ` Paolo Bonzini
2021-06-24 10:21 ` Paolo Bonzini
2021-06-24 10:21 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 10:21 ` Paolo Bonzini
2021-06-24 10:21 ` Paolo Bonzini
2021-06-24 10:21 ` Paolo Bonzini
2021-06-24 10:42 ` Nicholas Piggin
2021-06-24 10:42 ` Nicholas Piggin
2021-06-24 10:42 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 10:42 ` Nicholas Piggin
2021-06-24 10:42 ` Nicholas Piggin
2021-06-24 10:42 ` Nicholas Piggin
2021-06-24 9:40 ` Marc Zyngier
2021-06-24 9:40 ` Marc Zyngier
2021-06-24 9:40 ` [Intel-gfx] " Marc Zyngier
2021-06-24 9:40 ` Marc Zyngier
2021-06-24 9:40 ` Marc Zyngier
2021-06-24 9:40 ` Marc Zyngier
2021-06-24 9:40 ` Marc Zyngier
2021-06-24 3:57 ` [PATCH 3/6] KVM: x86/mmu: avoid struct page in MMU David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [Intel-gfx] " David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 7:31 ` Paolo Bonzini
2021-06-24 7:31 ` Paolo Bonzini
2021-06-24 7:31 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 7:31 ` Paolo Bonzini
2021-06-24 7:31 ` Paolo Bonzini
2021-06-24 7:31 ` Paolo Bonzini
2021-06-24 8:58 ` Nicholas Piggin
2021-06-24 8:58 ` Nicholas Piggin
2021-06-24 8:58 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 8:58 ` Nicholas Piggin
2021-06-24 8:58 ` Nicholas Piggin
2021-06-24 8:58 ` Nicholas Piggin
2021-06-24 10:06 ` Marc Zyngier
2021-06-24 10:06 ` Marc Zyngier
2021-06-24 10:06 ` [Intel-gfx] " Marc Zyngier
2021-06-24 10:06 ` Marc Zyngier
2021-06-24 10:06 ` Marc Zyngier
2021-06-24 10:06 ` Marc Zyngier
2021-06-24 10:06 ` Marc Zyngier
2021-06-24 10:17 ` Paolo Bonzini
2021-06-24 10:17 ` Paolo Bonzini
2021-06-24 10:17 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 10:17 ` Paolo Bonzini
2021-06-24 10:17 ` Paolo Bonzini
2021-06-24 10:17 ` Paolo Bonzini
2021-06-24 10:17 ` Paolo Bonzini
2021-06-24 10:43 ` Nicholas Piggin
2021-06-24 10:43 ` Nicholas Piggin
2021-06-24 10:43 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 10:43 ` Nicholas Piggin
2021-06-24 10:43 ` Nicholas Piggin
2021-06-24 10:43 ` Nicholas Piggin
2021-06-24 10:43 ` Nicholas Piggin
2021-06-24 3:57 ` [PATCH 4/6] KVM: arm64/mmu: " David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [Intel-gfx] " David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 10:43 ` Marc Zyngier
2021-06-24 10:43 ` Marc Zyngier
2021-06-24 10:43 ` [Intel-gfx] " Marc Zyngier
2021-06-24 10:43 ` Marc Zyngier
2021-06-24 10:43 ` Marc Zyngier
2021-06-24 10:43 ` Marc Zyngier
2021-06-24 10:43 ` Marc Zyngier
2021-06-24 3:57 ` [PATCH 5/6] KVM: mmu: remove over-aggressive warnings David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [Intel-gfx] " David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [PATCH 6/6] drm/i915/gvt: use gfn_to_pfn's page instead of pfn David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` [Intel-gfx] " David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 3:57 ` David Stevens
2021-06-24 4:28 ` David Stevens
2021-06-24 4:28 ` David Stevens
2021-06-24 4:28 ` [Intel-gfx] " David Stevens
2021-06-24 4:28 ` David Stevens
2021-06-24 4:28 ` David Stevens
2021-06-24 4:28 ` David Stevens
2021-06-24 10:25 ` kernel test robot
2021-06-24 10:38 ` kernel test robot
2021-06-24 4:19 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for KVM: Remove uses of struct page from x86 and arm64 MMU Patchwork
2021-06-24 6:57 ` [PATCH 0/6] " Paolo Bonzini
2021-06-24 6:57 ` Paolo Bonzini
2021-06-24 6:57 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 6:57 ` Paolo Bonzini
2021-06-24 6:57 ` Paolo Bonzini
2021-06-24 6:57 ` Paolo Bonzini
2021-06-24 10:34 ` Nicholas Piggin
2021-06-24 10:34 ` Nicholas Piggin
2021-06-24 10:34 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 10:34 ` Nicholas Piggin
2021-06-24 10:34 ` Nicholas Piggin
2021-06-24 10:34 ` Nicholas Piggin
2021-06-24 11:42 ` Nicholas Piggin
2021-06-24 11:42 ` Nicholas Piggin
2021-06-24 11:42 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 11:42 ` Nicholas Piggin
2021-06-24 11:42 ` Nicholas Piggin
2021-06-24 11:42 ` Nicholas Piggin
2021-06-24 12:00 ` Paolo Bonzini
2021-06-24 12:00 ` Paolo Bonzini
2021-06-24 12:00 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 12:00 ` Paolo Bonzini
2021-06-24 12:00 ` Paolo Bonzini
2021-06-24 12:00 ` Paolo Bonzini
2021-06-24 12:41 ` Paolo Bonzini
2021-06-24 12:41 ` Paolo Bonzini
2021-06-24 12:41 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 12:41 ` Paolo Bonzini
2021-06-24 12:41 ` Paolo Bonzini
2021-06-24 12:41 ` Paolo Bonzini
2021-06-24 12:57 ` Nicholas Piggin
2021-06-24 12:57 ` Nicholas Piggin
2021-06-24 12:57 ` [Intel-gfx] " Nicholas Piggin
2021-06-24 12:57 ` Nicholas Piggin
2021-06-24 12:57 ` Nicholas Piggin
2021-06-24 12:57 ` Nicholas Piggin
2021-06-24 15:35 ` Paolo Bonzini
2021-06-24 15:35 ` Paolo Bonzini
2021-06-24 15:35 ` [Intel-gfx] " Paolo Bonzini
2021-06-24 15:35 ` Paolo Bonzini
2021-06-24 15:35 ` Paolo Bonzini
2021-06-24 15:35 ` Paolo Bonzini
2021-06-25 0:20 ` Nicholas Piggin
2021-06-25 0:20 ` Nicholas Piggin
2021-06-25 0:20 ` [Intel-gfx] " Nicholas Piggin
2021-06-25 0:20 ` Nicholas Piggin
2021-06-25 0:20 ` Nicholas Piggin
2021-06-25 0:20 ` Nicholas Piggin
2021-06-25 7:44 ` Christian Borntraeger
2021-06-25 7:44 ` Christian Borntraeger
2021-06-25 7:44 ` [Intel-gfx] " Christian Borntraeger
2021-06-25 7:44 ` Christian Borntraeger
2021-06-25 7:44 ` Christian Borntraeger
2021-06-25 7:44 ` Christian Borntraeger
2021-06-24 16:07 ` Patchwork [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162455085102.1853.13788626720820759746@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=npiggin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.