✗ Fi.CI.BUILD: failure for lib/chamelium: Move chameliumv2 support in its own directory

[Patchwork]

== Series Details ==

Series: lib/chamelium: Move chameliumv2 support in its own directory
URL   : https://patchwork.freedesktop.org/series/140319/
State : failure

== Summary ==

Applying: tests/chamelium: Extract Chamelium v2 tests into a separate directory
Applying: lib/chamelium/v2: Extract chamelium v2 wrapper into its own directory
Using index info to reconstruct a base tree...
M	lib/igt_kms.c
M	lib/monitor_edids/monitor_edids_helper.h
Falling back to patching base and 3-way merge...
Auto-merging lib/monitor_edids/monitor_edids_helper.h
CONFLICT (content): Merge conflict in lib/monitor_edids/monitor_edids_helper.h
Auto-merging lib/igt_kms.c
Patch failed at 0002 lib/chamelium/v2: Extract chamelium v2 wrapper into its own directory
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".