✗ Fi.CI.BUILD: failure for Dynamic SSEU mashup
Patchwork
patchwork at emeril.freedesktop.org
Fri Jan 10 05:19:40 UTC 2020
== Series Details ==
Series: Dynamic SSEU mashup
URL : https://patchwork.freedesktop.org/series/71833/
State : failure
== Summary ==
Applying: drm/i915: Track per context/class rq completion frequency
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_context.c
M drivers/gpu/drm/i915/gt/intel_context.c
M drivers/gpu/drm/i915/gt/intel_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/gt/intel_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
Patch failed at 0001 drm/i915: Track per context/class rq completion frequency
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