[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [01/18] drm/i915: Apply batch location restrictions before pinning (rev3)

Patchwork patchwork at emeril.freedesktop.org
Fri Jun 8 18:03:15 UTC 2018


== Series Details ==

Series: series starting with [01/18] drm/i915: Apply batch location restrictions before pinning (rev3)
URL   : https://patchwork.freedesktop.org/series/44486/
State : failure

== Summary ==

Applying: drm/i915: Apply batch location restrictions before pinning
Applying: drm/i915/ringbuffer: Brute force context restore
Applying: drm/i915/ringbuffer: Fix context restore upon reset
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_gtt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
Patch failed at 0003 drm/i915/ringbuffer: Fix context restore upon reset
The copy of the patch that failed is found in: .git/rebase-apply/patch
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 mailing list