[Intel-gfx] ✗ Fi.CI.BUILD: failure for Connect VFIO to IOMMUFD (rev5)

[Patchwork]

== Series Details ==

Series: Connect VFIO to IOMMUFD (rev5)
URL   : https://patchwork.freedesktop.org/series/110133/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/110133/revisions/5/mbox/ not applied
Applying: vfio: Move vfio_device driver open/close code to a function
Applying: vfio: Move vfio_device_assign_container() into vfio_device_first_open()
Applying: vfio: Rename vfio_device_assign/unassign_container()
Applying: vfio: Move storage of allow_unsafe_interrupts to vfio_main.c
Applying: vfio: Use IOMMU_CAP_ENFORCE_CACHE_COHERENCY for vfio_file_enforced_coherent()
Applying: vfio-iommufd: Allow iommufd to be used in place of a container fd
Applying: vfio-iommufd: Support iommufd for physical VFIO devices
Applying: vfio-iommufd: Support iommufd for emulated VFIO devices
Applying: vfio: Move container related MODULE_ALIAS statements into container.c
Applying: vfio: Make vfio_container optionally compiled
Using index info to reconstruct a base tree...
A	drivers/iommu/iommufd/vfio_compat.c
M	drivers/vfio/vfio_main.c
A	include/linux/iommufd.h
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): include/linux/iommufd.h deleted in HEAD and modified in vfio: Make vfio_container optionally compiled. Version vfio: Make vfio_container optionally compiled of include/linux/iommufd.h left in tree.
Auto-merging drivers/vfio/vfio_main.c
CONFLICT (modify/delete): drivers/iommu/iommufd/vfio_compat.c deleted in HEAD and modified in vfio: Make vfio_container optionally compiled. Version vfio: Make vfio_container optionally compiled of drivers/iommu/iommufd/vfio_compat.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0010 vfio: Make vfio_container optionally compiled
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".