✗ Fi.CI.BUILD: failure for series starting with [1/5] drm/i915: Drop GEM context as a direct link from i915_request

Patchwork patchwork at emeril.freedesktop.org
Wed Oct 30 04:41:04 UTC 2019


== Series Details ==

Series: series starting with [1/5] drm/i915: Drop GEM context as a direct link from i915_request
URL   : https://patchwork.freedesktop.org/series/68700/
State : failure

== Summary ==

Applying: drm/i915: Drop GEM context as a direct link from i915_request
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_context.c
M	drivers/gpu/drm/i915/gem/i915_gem_context.h
M	drivers/gpu/drm/i915/gem/i915_gem_context_types.h
M	drivers/gpu/drm/i915/gt/intel_engine_cs.c
M	drivers/gpu/drm/i915/gt/intel_lrc.c
M	drivers/gpu/drm/i915/gt/selftest_lrc.c
M	drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
M	drivers/gpu/drm/i915/i915_gem.c
M	drivers/gpu/drm/i915/i915_gpu_error.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/i915_gpu_error.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context_types.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
Patch failed at 0001 drm/i915: Drop GEM context as a direct link from i915_request
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