✗ Fi.CI.BUILD: failure for Enable second DBuf slice for ICL and TGL (rev4)
Patchwork
patchwork at emeril.freedesktop.org
Mon Dec 23 20:42:55 UTC 2019
== Series Details ==
Series: Enable second DBuf slice for ICL and TGL (rev4)
URL : https://patchwork.freedesktop.org/series/70936/
State : failure
== Summary ==
Applying: drm/i915: Remove skl_ddl_allocation struct
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display.c
M drivers/gpu/drm/i915/display/intel_display_types.h
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
Applying: drm/i915: Move dbuf slice update to proper place
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
Patch failed at 0002 drm/i915: Move dbuf slice update to proper place
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