[igt-dev] ✗ Fi.CI.BUILD: failure for tests/panfrost: Misc fixes/improvements (rev3)

[Patchwork]

== Series Details ==

Series: tests/panfrost: Misc fixes/improvements (rev3)
URL   : https://patchwork.freedesktop.org/series/91726/
State : failure

== Summary ==

Applying: tests/panfrost: Make sure we open a DUMB capable node for prime tests
Using index info to reconstruct a base tree...
M	tests/panfrost_prime.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: lib/panfrost: Handle the NULL case in igt_panfrost_free_bo()
Using index info to reconstruct a base tree...
M	lib/igt_panfrost.c
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_panfrost.c
No changes -- Patch already applied.
Applying: lib/panfrost: Add a helper to create a job loop
Using index info to reconstruct a base tree...
M	lib/igt_panfrost.c
M	lib/igt_panfrost.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_panfrost.h
CONFLICT (content): Merge conflict in lib/igt_panfrost.h
Auto-merging lib/igt_panfrost.c
CONFLICT (content): Merge conflict in lib/igt_panfrost.c
Patch failed at 0003 lib/panfrost: Add a helper to create a job loop
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".