✗ Fi.CI.BUILD: failure for series starting with [1/8] drm/i915/execlists: Ignore the inactive kernel context in assert_pending_valid
Patchwork
patchwork at emeril.freedesktop.org
Mon Nov 4 21:21:20 UTC 2019
== Series Details ==
Series: series starting with [1/8] drm/i915/execlists: Ignore the inactive kernel context in assert_pending_valid
URL : https://patchwork.freedesktop.org/series/68916/
State : failure
== Summary ==
Applying: drm/i915/execlists: Ignore the inactive kernel context in assert_pending_valid
Using index info to reconstruct a base tree...
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
No changes -- Patch already applied.
Applying: drm/i915/selftests: Perform some basic cycle counting of MI ops
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/gt/intel_lrc.c
M drivers/gpu/drm/i915/i915_scheduler.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_scheduler.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scheduler.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Patch failed at 0003 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