✗ Fi.CI.BUILD: failure for drm/i915/dsb: Pre allocate and late cleanup of cmd buffer (rev4)

Patchwork patchwork at emeril.freedesktop.org
Mon Apr 27 22:12:56 UTC 2020


== Series Details ==

Series: drm/i915/dsb: Pre allocate and late cleanup of cmd buffer (rev4)
URL   : https://patchwork.freedesktop.org/series/73355/
State : failure

== Summary ==

Applying: drm/i915/dsb: Pre allocate and late cleanup of cmd buffer
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/display/intel_dsb.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dsb.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dsb.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
Patch failed at 0001 drm/i915/dsb: Pre allocate and late cleanup of cmd buffer
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