[igt-dev] ✗ Fi.CI.BUILD: failure for xe_vm: Add EIO test

[Patchwork]

== Series Details ==

Series: xe_vm: Add EIO test
URL   : https://patchwork.freedesktop.org/series/117200/
State : failure

== Summary ==

Applying: xe_vm: Add EIO test
Using index info to reconstruct a base tree...
M	lib/xe/xe_ioctl.c
M	lib/xe/xe_ioctl.h
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 lib/xe/xe_ioctl.h
Auto-merging lib/xe/xe_ioctl.c
Patch failed at 0001 xe_vm: Add EIO test
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".