✗ Fi.CI.BUILD: failure for series starting with [1/8] drm/i915: Drop inspection of execbuf flags during evict
Patchwork
patchwork at emeril.freedesktop.org
Thu Jan 23 05:30:49 UTC 2020
== Series Details ==
Series: series starting with [1/8] drm/i915: Drop inspection of execbuf flags during evict
URL : https://patchwork.freedesktop.org/series/72380/
State : failure
== Summary ==
Applying: drm/i915: Drop inspection of execbuf flags during evict
Applying: drm/i915/gem: Extract transient execbuf flags from i915_vma
Applying: drm/i915: Separate lookup and pinning in execbuf.
Applying: drm/i915: Add an implementation for i915_gem_ww_ctx locking, v2.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display.c
M drivers/gpu/drm/i915/gem/i915_gem_context.c
M drivers/gpu/drm/i915/gem/i915_gem_pm.c
M drivers/gpu/drm/i915/i915_gem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pm.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
Patch failed at 0004 drm/i915: Add an implementation for i915_gem_ww_ctx locking, v2.
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