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

[Patchwork]

== Series Details ==

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

== Summary ==

Applying: test_list.py: add support for reading testlist regular expressions
Applying: xe_test_config.json: add testlists and blocklists
Applying: kms_test_config.json: add testlists and blocklists
Applying: tests: Intel Xe: drop Run type field
Using index info to reconstruct a base tree...
M	tests/intel/xe_ccs.c
M	tests/intel/xe_create.c
M	tests/intel/xe_debugfs.c
M	tests/intel/xe_dma_buf_sync.c
M	tests/intel/xe_evict.c
M	tests/intel/xe_exec_balancer.c
M	tests/intel/xe_exec_basic.c
M	tests/intel/xe_exec_compute_mode.c
M	tests/intel/xe_exec_fault_mode.c
M	tests/intel/xe_exercise_blt.c
M	tests/intel/xe_intel_bb.c
M	tests/intel/xe_media_fill.c
M	tests/intel/xe_mmap.c
M	tests/intel/xe_mmio.c
M	tests/intel/xe_noexec_ping_pong.c
M	tests/intel/xe_pm.c
M	tests/intel/xe_query.c
M	tests/intel/xe_spin_batch.c
M	tests/intel/xe_sysfs_scheduler.c
M	tests/intel/xe_vm.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/xe_vm.c
CONFLICT (content): Merge conflict in tests/intel/xe_vm.c
Auto-merging tests/intel/xe_sysfs_scheduler.c
CONFLICT (content): Merge conflict in tests/intel/xe_sysfs_scheduler.c
Auto-merging tests/intel/xe_spin_batch.c
Auto-merging tests/intel/xe_query.c
CONFLICT (content): Merge conflict in tests/intel/xe_query.c
Auto-merging tests/intel/xe_pm.c
Auto-merging tests/intel/xe_noexec_ping_pong.c
CONFLICT (content): Merge conflict in tests/intel/xe_noexec_ping_pong.c
Auto-merging tests/intel/xe_mmio.c
CONFLICT (content): Merge conflict in tests/intel/xe_mmio.c
Auto-merging tests/intel/xe_mmap.c
CONFLICT (content): Merge conflict in tests/intel/xe_mmap.c
Auto-merging tests/intel/xe_media_fill.c
CONFLICT (content): Merge conflict in tests/intel/xe_media_fill.c
Auto-merging tests/intel/xe_intel_bb.c
Auto-merging tests/intel/xe_exercise_blt.c
Auto-merging tests/intel/xe_exec_fault_mode.c
CONFLICT (content): Merge conflict in tests/intel/xe_exec_fault_mode.c
Auto-merging tests/intel/xe_exec_compute_mode.c
CONFLICT (content): Merge conflict in tests/intel/xe_exec_compute_mode.c
Auto-merging tests/intel/xe_exec_basic.c
CONFLICT (content): Merge conflict in tests/intel/xe_exec_basic.c
Auto-merging tests/intel/xe_exec_balancer.c
CONFLICT (content): Merge conflict in tests/intel/xe_exec_balancer.c
Auto-merging tests/intel/xe_evict.c
CONFLICT (content): Merge conflict in tests/intel/xe_evict.c
Auto-merging tests/intel/xe_dma_buf_sync.c
CONFLICT (content): Merge conflict in tests/intel/xe_dma_buf_sync.c
Auto-merging tests/intel/xe_debugfs.c
Auto-merging tests/intel/xe_create.c
CONFLICT (content): Merge conflict in tests/intel/xe_create.c
Auto-merging tests/intel/xe_ccs.c
CONFLICT (content): Merge conflict in tests/intel/xe_ccs.c
Patch failed at 0004 tests: Intel Xe: 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".