✗ Fi.CI.BUILD: failure for series starting with [i-g-t,v5,2/2] HAX patch do not merge (rev6)

Patchwork patchwork at emeril.freedesktop.org
Thu Sep 26 15:04:38 UTC 2024


== Series Details ==

Series: series starting with [i-g-t,v5,2/2] HAX patch do not merge (rev6)
URL   : https://patchwork.freedesktop.org/series/137825/
State : failure

== Summary ==

Applying: HAX patch do not merge
Applying: HAX patch do not merge
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 HAX patch 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".




More information about the igt-dev mailing list