[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/7] lib/rendercopy: Copy gen8 surface state definition to gen-9 header (rev4)

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/7] lib/rendercopy: Copy gen8 surface state definition to gen-9 header (rev4)
URL   : https://patchwork.freedesktop.org/series/57553/
State : failure

== Summary ==

Applying: lib/rendercopy: Copy gen8 surface state definition to gen-9 header
Using index info to reconstruct a base tree...
M	lib/gen8_render.h
M	lib/gen9_render.h
M	lib/rendercopy_gen9.c
Falling back to patching base and 3-way merge...
Auto-merging lib/rendercopy_gen9.c
Auto-merging lib/gen9_render.h
CONFLICT (content): Merge conflict in lib/gen9_render.h
Patch failed at 0001 lib/rendercopy: Copy gen8 surface state definition to gen-9 header
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".