[igt-dev] ✗ Fi.CI.BUILD: failure for xe/xe_module_load: add a test to load/unload Xe driver

[Patchwork]

== Series Details ==

Series: xe/xe_module_load: add a test to load/unload Xe driver
URL   : https://patchwork.freedesktop.org/series/115511/
State : failure

== Summary ==

Applying: intel-ci: update blacklists to work with the Xe driver
Applying: lib/igt_kmod: add support for Xe driver
Applying: xe/xe_module_load: add a test to load/unload Xe driver
Using index info to reconstruct a base tree...
M	tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
CONFLICT (content): Merge conflict in tests/meson.build
Patch failed at 0003 xe/xe_module_load: add a test to load/unload Xe driver
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".