[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [01/38] drm/i915/execlists: Store the highest priority context (rev2)

Patchwork patchwork at emeril.freedesktop.org
Thu Jan 24 16:28:07 UTC 2019


== Series Details ==

Series: series starting with [01/38] drm/i915/execlists: Store the highest priority context (rev2)
URL   : https://patchwork.freedesktop.org/series/55411/
State : failure

== Summary ==

Applying: drm/i915/execlists: Store the highest priority context
Applying: drm/i915: Make all GPU resets atomic
Applying: drm/i915/guc: Disable global reset
Applying: drm/i915: Remove GPU reset dependence on struct_mutex
Applying: drm/i915/selftests: Trim struct_mutex duration for set-wedged selftest
Applying: drm/i915: Issue engine resets onto idle engines
Applying: drm/i915: Stop tracking MRU activity on VMA
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem.c
M	drivers/gpu/drm/i915/selftests/i915_gem_evict.c
M	drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_evict.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem_evict.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0007 drm/i915: Stop tracking MRU activity on VMA
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