== Series Details == Series: Remove the VFIO_IOMMU_NOTIFY_DMA_UNMAP notifier URL : https://patchwork.freedesktop.org/series/106501/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/106501/revisions/1/mbox/ not applied Applying: vfio: Replace the DMA unmapping notifier with a callback Using index info to reconstruct a base tree... M drivers/s390/cio/vfio_ccw_ops.c M drivers/s390/cio/vfio_ccw_private.h M drivers/vfio/vfio.c M include/linux/vfio.h Falling back to patching base and 3-way merge... Auto-merging include/linux/vfio.h CONFLICT (content): Merge conflict in include/linux/vfio.h Auto-merging drivers/vfio/vfio.c Auto-merging drivers/s390/cio/vfio_ccw_private.h CONFLICT (content): Merge conflict in drivers/s390/cio/vfio_ccw_private.h Auto-merging drivers/s390/cio/vfio_ccw_ops.c CONFLICT (content): Merge conflict in drivers/s390/cio/vfio_ccw_ops.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 vfio: Replace the DMA unmapping notifier with a callback 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".
