[igt-dev] ✗ Fi.CI.BUILD: failure for IGT tests for the KMS Color Pipeline API

[Patchwork]

== Series Details ==

Series: IGT tests for the KMS Color Pipeline API
URL   : https://patchwork.freedesktop.org/series/123448/
State : failure

== Summary ==

Applying: include/drm-uapi: Add COLOROP object
Applying: lib/igt_kms: Introduce drm_colorop object
Using index info to reconstruct a base tree...
M	lib/igt_kms.c
M	lib/igt_kms.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_kms.h
Auto-merging lib/igt_kms.c
Applying: lib/igt_kms: Add new COLOR PIPELINE plane property
Using index info to reconstruct a base tree...
M	lib/igt_kms.c
M	lib/igt_kms.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_kms.h
CONFLICT (content): Merge conflict in lib/igt_kms.h
Auto-merging lib/igt_kms.c
Patch failed at 0003 lib/igt_kms: Add new COLOR PIPELINE plane property
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".