✗ Fi.CI.BUILD: failure for series starting with [1/5] drm/i915: Make exclusive awaits on i915_active optional

Patchwork patchwork at emeril.freedesktop.org
Mon Apr 6 23:55:44 UTC 2020


== Series Details ==

Series: series starting with [1/5] drm/i915: Make exclusive awaits on i915_active optional
URL   : https://patchwork.freedesktop.org/series/75563/
State : failure

== Summary ==

Applying: drm/i915: Make exclusive awaits on i915_active optional
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_active.c
M	drivers/gpu/drm/i915/i915_active.h
M	drivers/gpu/drm/i915/i915_perf.c
M	drivers/gpu/drm/i915/i915_vma.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_active.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_active.h
Auto-merging drivers/gpu/drm/i915/i915_active.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_active.c
Patch failed at 0001 drm/i915: Make exclusive awaits on i915_active optional
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