[Intel-gfx] ✗ Fi.CI.BUILD: failure for vfio: fix deadlock between group lock and kvm lock (rev7)
Patchwork
patchwork at emeril.freedesktop.org
Fri Feb 3 21:07:18 UTC 2023
== Series Details ==
Series: vfio: fix deadlock between group lock and kvm lock (rev7)
URL : https://patchwork.freedesktop.org/series/113535/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/113535/revisions/7/mbox/ not applied
Applying: vfio: fix deadlock between group lock and kvm lock
Using index info to reconstruct a base tree...
M drivers/vfio/group.c
M drivers/vfio/vfio.h
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
Auto-merging drivers/vfio/vfio.h
CONFLICT (content): Merge conflict in drivers/vfio/vfio.h
Auto-merging drivers/vfio/group.c
CONFLICT (content): Merge conflict in drivers/vfio/group.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 vfio: fix deadlock between group lock and kvm lock
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".
More information about the Intel-gfx
mailing list