✗ Fi.CI.BUILD: failure for vmaref (rev2)

Patchwork patchwork at emeril.freedesktop.org
Sat May 23 14:46:14 UTC 2020


== Series Details ==

Series: vmaref (rev2)
URL   : https://patchwork.freedesktop.org/series/77570/
State : failure

== Summary ==

Applying: vmaref
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 vmaref
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