== Series Details == Series: Add vfio_device cdev for iommufd support (rev6) URL : https://patchwork.freedesktop.org/series/113696/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/113696/revisions/6/mbox/ not applied Applying: vfio: Allocate per device file structure Using index info to reconstruct a base tree... M drivers/vfio/group.c M drivers/vfio/vfio.h M drivers/vfio/vfio_main.c Falling back to patching base and 3-way merge... Auto-merging drivers/vfio/vfio_main.c Auto-merging drivers/vfio/vfio.h Auto-merging drivers/vfio/group.c Applying: vfio: Refine vfio file kAPIs for KVM Using index info to reconstruct a base tree... M drivers/vfio/group.c M drivers/vfio/vfio.h 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/vfio.h Auto-merging drivers/vfio/group.c CONFLICT (content): Merge conflict in drivers/vfio/group.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: Refine vfio file kAPIs for KVM 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".
