[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/2] lib/igt_fb: check device type before calling intel_get_drm_devid
Patchwork
patchwork at emeril.freedesktop.org
Thu Aug 5 03:55:07 UTC 2021
== Series Details ==
Series: series starting with [i-g-t,1/2] lib/igt_fb: check device type before calling intel_get_drm_devid
URL : https://patchwork.freedesktop.org/series/93400/
State : failure
== Summary ==
Applying: lib/igt_fb: check device type before calling intel_get_drm_devid
Using index info to reconstruct a base tree...
M lib/igt_fb.c
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_fb.c
CONFLICT (content): Merge conflict in lib/igt_fb.c
Patch failed at 0001 lib/igt_fb: check device type before calling intel_get_drm_devid
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