✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915/gt: Push context state allocation earlier
Patchwork
patchwork at emeril.freedesktop.org
Fri Jan 10 02:45:49 UTC 2020
== Series Details ==
Series: series starting with [1/2] drm/i915/gt: Push context state allocation earlier
URL : https://patchwork.freedesktop.org/series/71770/
State : failure
== Summary ==
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 0001 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