✗ Fi.CI.BAT: failure for series starting with [01/34] drm/i915: Introduce the i915_user_extension_method
Patchwork
patchwork at emeril.freedesktop.org
Sat Mar 9 21:05:02 UTC 2019
== Series Details ==
Series: series starting with [01/34] drm/i915: Introduce the i915_user_extension_method
URL : https://patchwork.freedesktop.org/series/57801/
State : failure
== Summary ==
Applying: drm/i915: Introduce the i915_user_extension_method
Applying: drm/i915: Introduce a context barrier callback
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_gem_context.c
M drivers/gpu/drm/i915/selftests/i915_gem_context.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem_context.c
Patch failed at 0002 drm/i915: Introduce a context barrier callback
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