== Series Details == Series: vfio: Give VFIO_DEVICE_GET_REGION_INFO its own op URL : https://patchwork.freedesktop.org/series/156452/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/156452/revisions/1/mbox/ not applied Applying: vfio: Provide a get_region_info op Applying: vfio/hisi: Convert to the get_region_info op Applying: vfio/virtio: Convert to the get_region_info op Applying: vfio/nvgrace: Convert to the get_region_info op Applying: vfio/pci: Fill in the missing get_region_info ops Applying: vfio/mtty: Provide a get_region_info op Applying: vfio/mdpy: Provide a get_region_info op Applying: vfio/mbochs: Provide a get_region_info op Applying: vfio/platform: Provide a get_region_info op Applying: vfio/fsl: Provide a get_region_info op Applying: vfio/cdx: Provide a get_region_info op Applying: vfio/ccw: Provide a get_region_info op Applying: vfio/gvt: Provide a get_region_info op Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gvt/kvmgt.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/kvmgt.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0013 vfio/gvt: Provide a get_region_info op 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
