[Intel-gfx] ✗ Fi.CI.BUILD: failure for cover-letter: Update vfio_pin/unpin_pages API

[Patchwork]

== Series Details ==

Series: cover-letter: Update vfio_pin/unpin_pages API
URL   : https://patchwork.freedesktop.org/series/106978/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/106978/revisions/1/mbox/ not applied
Applying: vfio: Make vfio_unpin_pages() return void
Using index info to reconstruct a base tree...
M	Documentation/driver-api/vfio-mediated-device.rst
M	drivers/gpu/drm/i915/gvt/kvmgt.c
M	drivers/vfio/vfio.c
M	drivers/vfio/vfio.h
M	drivers/vfio/vfio_iommu_type1.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_iommu_type1.c
Auto-merging drivers/vfio/vfio.h
Auto-merging drivers/vfio/vfio.c
Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c
Auto-merging Documentation/driver-api/vfio-mediated-device.rst
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: Make vfio_unpin_pages() return void
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".