[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [v5] dma-fence: Propagate errors to dma-fence-array container (rev7)

[Patchwork]

== Series Details ==

Series: series starting with [v5] dma-fence: Propagate errors to dma-fence-array container (rev7)
URL   : https://patchwork.freedesktop.org/series/65027/
State : failure

== Summary ==

Applying: dma-fence: Propagate errors to dma-fence-array container
Using index info to reconstruct a base tree...
M	drivers/dma-buf/dma-fence-array.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: dma-fence: Report the composite sync_file status
Using index info to reconstruct a base tree...
M	drivers/dma-buf/sync_file.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: dma-fence: Refactor signaling for manual invocation
Using index info to reconstruct a base tree...
M	drivers/dma-buf/Makefile
M	drivers/dma-buf/dma-fence.c
M	drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
M	include/linux/dma-fence.h
Falling back to patching base and 3-way merge...
Auto-merging include/linux/dma-fence.h
Auto-merging drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
Auto-merging drivers/dma-buf/dma-fence.c
Auto-merging drivers/dma-buf/Makefile
CONFLICT (content): Merge conflict in drivers/dma-buf/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0003 dma-fence: Refactor signaling for manual invocation
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".