[igt-dev] ✗ Fi.CI.BUILD: failure for Xe: set Run type from testlist instead of defining it

[Patchwork]

== Series Details ==

Series: Xe: set Run type from testlist instead of defining it
URL   : https://patchwork.freedesktop.org/series/123290/
State : failure

== Summary ==

Applying: xe_test_config.json: add testlists and blacklists
Applying: tests/intel/xe*.c: drop Run type field
Using index info to reconstruct a base tree...
M	tests/intel/xe_pm_residency.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/xe_pm_residency.c
CONFLICT (content): Merge conflict in tests/intel/xe_pm_residency.c
Patch failed at 0002 tests/intel/xe*.c: drop Run type field
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".