== Series Details == Series: kvm/vfio: fix potential deadlock on vfio group lock (rev2) URL : https://patchwork.freedesktop.org/series/112568/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/112568/revisions/2/mbox/ not applied Applying: KVM: async kvm_destroy_vm for vfio devices Using index info to reconstruct a base tree... M drivers/vfio/vfio_main.c Falling back to patching base and 3-way merge... Auto-merging drivers/vfio/vfio_main.c CONFLICT (content): Merge conflict in drivers/vfio/vfio_main.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 KVM: async kvm_destroy_vm for vfio devices 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".
