[igt-dev] ✗ Fi.CI.BUILD: failure for Revert Color patches

[Patchwork]

== Series Details ==

Series: Revert Color patches
URL   : https://patchwork.freedesktop.org/series/108864/
State : failure

== Summary ==

Applying: Revert "tests/kms_color: fix crc assert condition"
Applying: Revert "tests/kms: Fix to use max_bpc constraint helper"
Applying: Revert "tests/kms_color: Fix multiple failures in deep-color tests"
Applying: Revert "tests/kms_color: Fix memory leaks"
Applying: Revert "tests/kms_color: Test Cleanup"
Applying: Revert "tests/kms_color: Convert tests to dynamic"
Applying: Revert "tests/kms_color_chamelium: Convert tests to dynamic"
Using index info to reconstruct a base tree...
M	tests/chamelium/kms_color_chamelium.c
Falling back to patching base and 3-way merge...
Auto-merging tests/chamelium/kms_color_chamelium.c
CONFLICT (content): Merge conflict in tests/chamelium/kms_color_chamelium.c
Patch failed at 0007 Revert "tests/kms_color_chamelium: Convert tests to dynamic"
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".