== Series Details == Series: Enhance vfio PCI hot reset for vfio cdev device (rev6) URL : https://patchwork.freedesktop.org/series/116991/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/116991/revisions/6/mbox/ not applied Applying: vfio/pci: Update comment around group_fd get in vfio_pci_ioctl_pci_hot_reset() Applying: vfio/pci: Move the existing hot reset logic to be a helper Applying: iommufd: Reserve all negative IDs in the iommufd xarray Applying: iommufd: Add iommufd_ctx_has_group() Applying: iommufd: Add helper to retrieve iommufd_ctx and devid Applying: vfio: Mark cdev usage in vfio_device Applying: vfio: Add helper to search vfio_device in a dev_set Applying: vfio/pci: Extend VFIO_DEVICE_GET_PCI_HOT_RESET_INFO for vfio device cdev Using index info to reconstruct a base tree... M drivers/vfio/pci/vfio_pci_core.c Falling back to patching base and 3-way merge... Auto-merging drivers/vfio/pci/vfio_pci_core.c CONFLICT (content): Merge conflict in drivers/vfio/pci/vfio_pci_core.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0008 vfio/pci: Extend VFIO_DEVICE_GET_PCI_HOT_RESET_INFO for vfio device cdev 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
