✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Make HW readout mark CRTC scaler as in use.

Patchwork patchwork at emeril.freedesktop.org
Fri Sep 21 15:45:22 UTC 2018


== Series Details ==

Series: series starting with [1/2] drm/i915: Make HW readout mark CRTC scaler as in use.
URL   : https://patchwork.freedesktop.org/series/50019/
State : failure

== Summary ==

Applying: drm/i915: Make HW readout mark CRTC scaler as in use.
Applying: drm/i915/DEBUG: Sanity check all scaler state after updating all scalers
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_atomic.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_atomic.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_atomic.c
Patch failed at 0002 drm/i915/DEBUG: Sanity check all scaler state after updating all scalers
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