✗ Fi.CI.BUILD: failure for Add plane color pipeline tests for Intel hardware (rev2)

[Patchwork]

== Series Details ==

Series: Add plane color pipeline tests for Intel hardware (rev2)
URL   : https://patchwork.freedesktop.org/series/150455/
State : failure

== Summary ==

Applying: tests/kms_colorop: Color pipeline igt base work
Using index info to reconstruct a base tree...
M	lib/igt_kms.c
M	lib/igt_kms.h
M	lib/meson.build
M	tests/kms_writeback.c
M	tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
Auto-merging tests/kms_writeback.c
Auto-merging lib/meson.build
Auto-merging lib/igt_kms.h
CONFLICT (content): Merge conflict in lib/igt_kms.h
Auto-merging lib/igt_kms.c
CONFLICT (content): Merge conflict in lib/igt_kms.c
Patch failed at 0001 tests/kms_colorop: Color pipeline igt base work
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".