[igt-dev] ✗ Fi.CI.BUILD: failure for Add IGT support for plane color management (rev4)
Patchwork
patchwork at emeril.freedesktop.org
Fri May 6 04:08:22 UTC 2022
== Series Details ==
Series: Add IGT support for plane color management (rev4)
URL : https://patchwork.freedesktop.org/series/96895/
State : failure
== Summary ==
Applying: HAX: Get uapi headers to compile the IGT
Applying: lib/igt_kms: Add plane color mgmt properties
Applying: kms_color_helper: Add helper functions for plane color mgmt
Using index info to reconstruct a base tree...
M tests/kms_color_helper.c
M tests/kms_color_helper.h
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_color_helper.h
CONFLICT (content): Merge conflict in tests/kms_color_helper.h
Auto-merging tests/kms_color_helper.c
Patch failed at 0003 kms_color_helper: Add helper functions for plane color mgmt
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".
More information about the igt-dev
mailing list