[Intel-gfx] ✗ Fi.CI.BUILD: failure for Tidy up vfio_device life cycle (rev5)
Patchwork
patchwork at emeril.freedesktop.org
Wed Sep 7 14:06:36 UTC 2022
== Series Details ==
Series: Tidy up vfio_device life cycle (rev5)
URL : https://patchwork.freedesktop.org/series/107838/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/107838/revisions/5/mbox/ not applied
Applying: vfio: Add helpers for unifying vfio_device life cycle
Using index info to reconstruct a base tree...
M samples/vfio-mdev/mbochs.c
Falling back to patching base and 3-way merge...
Auto-merging samples/vfio-mdev/mbochs.c
CONFLICT (content): Merge conflict in samples/vfio-mdev/mbochs.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: Add helpers for unifying vfio_device life cycle
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