[igt-dev] ✗ Fi.CI.BUILD: failure for IGT bits for small-bar (rev2)

[Patchwork]

== Series Details ==

Series: IGT bits for small-bar (rev2)
URL   : https://patchwork.freedesktop.org/series/115786/
State : failure

== Summary ==

Applying: xe: sync small-bar uapi
Applying: lib/xe: add visible vram helpers
Using index info to reconstruct a base tree...
M	lib/xe/xe_query.c
M	lib/xe/xe_query.h
Falling back to patching base and 3-way merge...
Auto-merging lib/xe/xe_query.h
Auto-merging lib/xe/xe_query.c
Applying: tests/xe: handle small-bar systems
Using index info to reconstruct a base tree...
M	tests/xe/xe_dma_buf_sync.c
M	tests/xe/xe_evict.c
M	tests/xe/xe_exec_balancer.c
M	tests/xe/xe_exec_basic.c
M	tests/xe/xe_exec_compute_mode.c
M	tests/xe/xe_exec_fault_mode.c
M	tests/xe/xe_exec_reset.c
M	tests/xe/xe_exec_threads.c
M	tests/xe/xe_guc_pc.c
M	tests/xe/xe_pm.c
M	tests/xe/xe_prime_self_import.c
M	tests/xe/xe_vm.c
Falling back to patching base and 3-way merge...
Auto-merging tests/xe/xe_vm.c
CONFLICT (content): Merge conflict in tests/xe/xe_vm.c
Auto-merging tests/xe/xe_prime_self_import.c
Auto-merging tests/xe/xe_pm.c
Auto-merging tests/xe/xe_guc_pc.c
Auto-merging tests/xe/xe_exec_threads.c
Auto-merging tests/xe/xe_exec_reset.c
Auto-merging tests/xe/xe_exec_fault_mode.c
Auto-merging tests/xe/xe_exec_compute_mode.c
Auto-merging tests/xe/xe_exec_basic.c
Auto-merging tests/xe/xe_exec_balancer.c
Auto-merging tests/xe/xe_evict.c
Auto-merging tests/xe/xe_dma_buf_sync.c
Patch failed at 0003 tests/xe: handle small-bar systems
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".