✗ Fi.CI.BUILD: failure for tests/intel/xe_multi_tile: Multi-Tile support in IGT (rev3)
Patchwork
patchwork at emeril.freedesktop.org
Sat Feb 15 02:17:17 UTC 2025
== Series Details ==
Series: tests/intel/xe_multi_tile: Multi-Tile support in IGT (rev3)
URL : https://patchwork.freedesktop.org/series/144187/
State : failure
== Summary ==
Applying: tests/intel/xe_multi_tile: Multi-Tile support in IGT
Using index info to reconstruct a base tree...
M include/drm-uapi/xe_drm.h
M lib/igt_sysfs.c
M lib/xe/xe_query.h
M tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
Auto-merging lib/xe/xe_query.h
Auto-merging lib/igt_sysfs.c
Auto-merging include/drm-uapi/xe_drm.h
CONFLICT (content): Merge conflict in include/drm-uapi/xe_drm.h
Patch failed at 0001 tests/intel/xe_multi_tile: Multi-Tile support in IGT
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".
More information about the igt-dev
mailing list