== Series Details == Series: drm/dp: move intel_dp_vsc_sdp_pack() to generic helper URL : https://patchwork.freedesktop.org/series/129866/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/129866/revisions/1/mbox/ not applied Applying: drm/dp: move intel_dp_vsc_sdp_pack() to generic helper Using index info to reconstruct a base tree... M drivers/gpu/drm/display/drm_dp_helper.c M drivers/gpu/drm/i915/display/intel_dp.c M include/drm/display/drm_dp_helper.h Falling back to patching base and 3-way merge... Auto-merging include/drm/display/drm_dp_helper.h Auto-merging drivers/gpu/drm/i915/display/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c Auto-merging drivers/gpu/drm/display/drm_dp_helper.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/dp: move intel_dp_vsc_sdp_pack() to generic helper 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
