[Intel-gfx] ✗ Fi.CI.BUILD: failure for Add vfio_device cdev for iommufd support (rev13)
Patchwork
patchwork at emeril.freedesktop.org
Sat May 13 14:13:25 UTC 2023
== Series Details ==
Series: Add vfio_device cdev for iommufd support (rev13)
URL : https://patchwork.freedesktop.org/series/113696/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/113696/revisions/13/mbox/ not applied
Applying: vfio: Allocate per device file structure
Applying: vfio: Refine vfio file kAPIs for KVM
Applying: vfio: Accept vfio device file in the KVM facing kAPI
Applying: kvm/vfio: Rename kvm_vfio_group to prepare for accepting vfio device fd
Applying: kvm/vfio: Accept vfio device file from userspace
Applying: vfio: Pass struct vfio_device_file * to vfio_device_open/close()
Applying: vfio: Block device access via device fd until device is opened
Applying: vfio: Add cdev_device_open_cnt to vfio_group
Applying: vfio: Make vfio_device_open() single open for device cdev path
Applying: vfio-iommufd: Move noiommu compat probe out of vfio_iommufd_bind()
Using index info to reconstruct a base tree...
M drivers/vfio/iommufd.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/vfio/iommufd.c
CONFLICT (content): Merge conflict in drivers/vfio/iommufd.c
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-iommufd: Move noiommu compat probe out of vfio_iommufd_bind()
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".
Build failed, no error log produced
More information about the Intel-gfx
mailing list