== Series Details == Series: Enable Adaptive Sync SDP Support for DP (rev19) URL : https://patchwork.freedesktop.org/series/126829/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/126829/revisions/19/mbox/ not applied Applying: drm/dp: Add support to indicate if sink supports AS SDP Applying: drm: Add Adaptive Sync SDP logging Applying: drm/i915/display: Add crtc state dump for Adaptive Sync SDP Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_crtc_state_dump.c M drivers/gpu/drm/i915/display/intel_display_types.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_crtc_state_dump.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_crtc_state_dump.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/i915/display: Add crtc state dump for Adaptive Sync SDP 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
