== Series Details == Series: Add support for 3 VDSC engines 12 slices URL : https://patchwork.freedesktop.org/series/139934/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/139934/revisions/1/mbox/ not applied Applying: drm/i915/display: Prepare for dsc 3 stream splitter 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_dp.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_dp.c Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/display: Prepare for dsc 3 stream splitter 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". Build failed, no error log produced
