== Series Details == Series: Enhance vfio PCI hot reset for vfio cdev device URL : https://patchwork.freedesktop.org/series/116991/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/116991/revisions/1/mbox/ not applied Applying: vfio: Determine noiommu in vfio_device registration Using index info to reconstruct a base tree... M drivers/vfio/iommufd.c M drivers/vfio/vfio_main.c M include/linux/vfio.h Falling back to patching base and 3-way merge... Auto-merging include/linux/vfio.h Auto-merging drivers/vfio/vfio_main.c Auto-merging drivers/vfio/iommufd.c Applying: vfio-iommufd: Create iommufd_access for noiommu devices 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 0002 vfio-iommufd: Create iommufd_access for noiommu devices 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
