[igt-dev] ✗ Fi.CI.BUILD: failure for V3D Mixed Job Submission Tests

[Patchwork]

== Series Details ==

Series: V3D Mixed Job Submission Tests
URL   : https://patchwork.freedesktop.org/series/112805/
State : failure

== Summary ==

Applying: lib/v3d: Add a helper to create a empty shader
Using index info to reconstruct a base tree...
M	lib/igt_v3d.c
M	lib/igt_v3d.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_v3d.h
CONFLICT (content): Merge conflict in lib/igt_v3d.h
Auto-merging lib/igt_v3d.c
CONFLICT (content): Merge conflict in lib/igt_v3d.c
Patch failed at 0001 lib/v3d: Add a helper to create a empty shader
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".