== Series Details == Series: series starting with [v2,1/3] drm/i915: Don't switch to TPS1 when disabling DP_TP_CTL (rev2) URL : https://patchwork.freedesktop.org/series/114011/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/114011/revisions/2/mbox/ not applied Applying: drm/i915: Don't switch to TPS1 when disabling DP_TP_CTL Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_ddi.c M drivers/gpu/drm/i915/display/intel_fdi.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_fdi.c Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.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: Don't switch to TPS1 when disabling DP_TP_CTL 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".
