✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915/execlists: Avoid reusing the same logical CCID

Patchwork patchwork at emeril.freedesktop.org
Wed Apr 29 01:36:36 UTC 2020


== Series Details ==

Series: series starting with [1/2] drm/i915/execlists: Avoid reusing the same logical CCID
URL   : https://patchwork.freedesktop.org/series/76580/
State : failure

== Summary ==

Applying: drm/i915/execlists: Avoid reusing the same logical CCID
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_context_types.h
M	drivers/gpu/drm/i915/gt/intel_engine_cs.c
M	drivers/gpu/drm/i915/gt/intel_engine_types.h
M	drivers/gpu/drm/i915/gt/intel_lrc.c
M	drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
M	drivers/gpu/drm/i915/gvt/scheduler.c
M	drivers/gpu/drm/i915/i915_perf.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_perf.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h
Patch failed at 0001 drm/i915/execlists: Avoid reusing the same logical CCID
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