[igt-dev] ✗ Fi.CI.BUILD: failure for Introduce blt_cmd_info struct (rev4)

[Patchwork]

== Series Details ==

Series: Introduce blt_cmd_info struct (rev4)
URL   : https://patchwork.freedesktop.org/series/112055/
State : failure

== Summary ==

Applying: i915/lib: Add new library for blitter and tiling formats
Applying: lib: Update platform definitions with blitter information
Applying: lib/i915_blt: Check for Tile-YF in fast_copy
Applying: lib/i915_blt: Add common functions for blt_copy_object
Using index info to reconstruct a base tree...
M	tests/i915/gem_ccs.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_ccs.c
CONFLICT (content): Merge conflict in tests/i915/gem_ccs.c
Patch failed at 0004 lib/i915_blt: Add common functions for blt_copy_object
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".