[Intel-gfx] ✗ Fi.CI.BUILD: failure for Tidy up vfio_device life cycle (rev7)

[Patchwork]

== Series Details ==

Series: Tidy up vfio_device life cycle (rev7)
URL   : https://patchwork.freedesktop.org/series/107838/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/107838/revisions/7/mbox/ not applied
Applying: vfio: Add helpers for unifying vfio_device life cycle
Applying: vfio/pci: Use the new device life cycle helpers
Applying: vfio/mlx5: Use the new device life cycle helpers
Using index info to reconstruct a base tree...
M	drivers/vfio/pci/mlx5/main.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/vfio/pci/mlx5/main.c
CONFLICT (content): Merge conflict in drivers/vfio/pci/mlx5/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 0003 vfio/mlx5: Use the new device life cycle helpers
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".