✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/2] tests/chamelium/kms_chamelium_edid: Use extended flag to reduce the number of edid

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] tests/chamelium/kms_chamelium_edid: Use extended flag to reduce the number of edid
URL   : https://patchwork.freedesktop.org/series/140134/
State : failure

== Summary ==

Applying: tests/chamelium/kms_chamelium_edid: Use extended flag to reduce the number of edid
Applying: HAX: Do not merge
Using index info to reconstruct a base tree...
M	tests/intel-ci/fast-feedback.testlist
M	tests/intel-ci/xe-fast-feedback.testlist
Falling back to patching base and 3-way merge...
Auto-merging tests/intel-ci/xe-fast-feedback.testlist
CONFLICT (content): Merge conflict in tests/intel-ci/xe-fast-feedback.testlist
Auto-merging tests/intel-ci/fast-feedback.testlist
CONFLICT (content): Merge conflict in tests/intel-ci/fast-feedback.testlist
Patch failed at 0002 HAX: Do not merge
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".