[igt-dev] ✗ Fi.CI.BUILD: failure for Vendor agnostic gputop (rev6)
Patchwork
patchwork at emeril.freedesktop.org
Thu Apr 6 14:44:59 UTC 2023
== Series Details ==
Series: Vendor agnostic gputop (rev6)
URL : https://patchwork.freedesktop.org/series/102175/
State : failure
== Summary ==
Applying: lib: Extract igt_drm_clients from intel_gpu_top
Applying: lib: Allow specifying custom engine map
Using index info to reconstruct a base tree...
M lib/igt_drm_fdinfo.c
M tests/i915/drm_fdinfo.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/drm_fdinfo.c
Auto-merging lib/igt_drm_fdinfo.c
CONFLICT (content): Merge conflict in lib/igt_drm_fdinfo.c
Patch failed at 0002 lib: Allow specifying custom engine map
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