[igt-dev] ✗ Fi.CI.BUILD: failure for xe/xe_prime_self_import: remove reimport-vs-gem_close-race from BAT

[Patchwork]

== Series Details ==

Series: xe/xe_prime_self_import: remove reimport-vs-gem_close-race from BAT
URL   : https://patchwork.freedesktop.org/series/116388/
State : failure

== Summary ==

Applying: xe/xe_prime_self_import: remove reimport-vs-gem_close-race from BAT
Using index info to reconstruct a base tree...
M	tests/intel-ci/xe-fast-feedback.testlist
M	tests/xe/xe_prime_self_import.c
Falling back to patching base and 3-way merge...
Auto-merging tests/xe/xe_prime_self_import.c
Auto-merging tests/intel-ci/xe-fast-feedback.testlist
CONFLICT (content): Merge conflict in tests/intel-ci/xe-fast-feedback.testlist
Patch failed at 0001 xe/xe_prime_self_import: remove reimport-vs-gem_close-race from BAT
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".