✗ Fi.CI.BAT: failure for series starting with [1/8] drm/i915: Record GT workarounds in a list

Patchwork patchwork at emeril.freedesktop.org
Tue Dec 4 18:58:12 UTC 2018


== Series Details ==

Series: series starting with [1/8] drm/i915: Record GT workarounds in a list
URL   : https://patchwork.freedesktop.org/series/53464/
State : failure

== Summary ==

Applying: drm/i915: Record GT workarounds in a list
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_gem.c
M	drivers/gpu/drm/i915/intel_workarounds.c
M	drivers/gpu/drm/i915/intel_workarounds.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_workarounds.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_workarounds.h
Auto-merging drivers/gpu/drm/i915/intel_workarounds.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_workarounds.c
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/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
Patch failed at 0001 drm/i915: Record GT workarounds in a list
Use 'git am --show-current-patch' to see the failed 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-trybot mailing list