== Series Details == Series: Revert "drm/dp: Change AUX DPCD probe address from DPCD_REV to LANE0_1_STATUS" (rev7) URL : https://patchwork.freedesktop.org/series/153652/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/153652/revisions/7/mbox/ not applied Applying: Revert "drm/dp: Change AUX DPCD probe address from DPCD_REV to LANE0_1_STATUS" 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 Revert "drm/dp: Change AUX DPCD probe address from DPCD_REV to LANE0_1_STATUS" 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
