[igt-dev] ✗ Fi.CI.BUILD: failure for Extend system-suspend-without-i915 (rev2)

[Patchwork]

== Series Details ==

Series: Extend system-suspend-without-i915 (rev2)
URL   : https://patchwork.freedesktop.org/series/103053/
State : failure

== Summary ==

Applying: tests/i915/i915_suspend: Add s2idle and s3 subtests without i915
Applying: tests/intel-ci/fast-feedback: Add suspend tests without i915 to fast-feedback list
Using index info to reconstruct a base tree...
M	tests/intel-ci/fast-feedback.testlist
Falling back to patching base and 3-way merge...
Auto-merging tests/intel-ci/fast-feedback.testlist
CONFLICT (content): Merge conflict in tests/intel-ci/fast-feedback.testlist
Patch failed at 0002 tests/intel-ci/fast-feedback: Add suspend tests without i915 to fast-feedback list
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".