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