[Intel-gfx] ✗ Fi.CI.BUILD: failure for Provide core infrastructure for managing open/release (rev6)

Patchwork
2021-07-23T09:41:13Z

== Series Details ==

Series: Provide core infrastructure for managing open/release (rev6)
URL : https://patchwork.freedesktop.org/series/92556/
State : failure

== Summary ==

Applying: vfio/samples: Remove module get/put
Applying: vfio/mbochs: Fix missing error unwind in mbochs_probe()
Applying: vfio: Introduce a vfio_uninit_group_dev() API call
Using index info to reconstruct a base tree...
M drivers/vfio/pci/vfio_pci.c
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
Auto-merging drivers/vfio/pci/vfio_pci.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 vfio: Introduce a vfio_uninit_group_dev() API call
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".