✗ Fi.CI.BUILD: failure for series starting with [1/7] drm/i915: introduce a mechanism to extend execbuf2
Patchwork
patchwork at emeril.freedesktop.org
Tue Mar 31 05:00:47 UTC 2020
== Series Details ==
Series: series starting with [1/7] drm/i915: introduce a mechanism to extend execbuf2
URL : https://patchwork.freedesktop.org/series/75255/
State : failure
== Summary ==
Applying: drm/i915: introduce a mechanism to extend execbuf2
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
M include/uapi/drm/i915_drm.h
Falling back to patching base and 3-way merge...
Auto-merging include/uapi/drm/i915_drm.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Patch failed at 0001 drm/i915: introduce a mechanism to extend execbuf2
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 Intel-gfx-trybot
mailing list