✗ Fi.CI.BUILD: failure for series starting with [01/17] drm/i915/gt: Drop a defunct timeline assertion

Patchwork patchwork at emeril.freedesktop.org
Fri Jan 10 05:18:34 UTC 2020


== Series Details ==

Series: series starting with [01/17] drm/i915/gt: Drop a defunct timeline assertion
URL   : https://patchwork.freedesktop.org/series/71796/
State : failure

== Summary ==

Applying: drm/i915/gt: Drop a defunct timeline assertion
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_timeline.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Early return for no-op i915_vma_pin_fence()
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_fence_reg.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Reduce warning for i915_vma_pin_iomap() without runtime-pm
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_vma.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/gt: Push context state allocation earlier
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_context.c
M	drivers/gpu/drm/i915/gt/intel_context.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_context.h
Auto-merging drivers/gpu/drm/i915/gt/intel_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c
Patch failed at 0004 drm/i915/gt: Push context state allocation earlier
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