[Intel-gfx] ✗ Fi.CI.BUILD: failure for Revert "drm/i915: Try to use fast+narrow link on eDP again and fall back to the old max strategy on failure"
Patchwork
patchwork at emeril.freedesktop.org
Mon May 10 10:31:17 UTC 2021
== Series Details ==
Series: Revert "drm/i915: Try to use fast+narrow link on eDP again and fall back to the old max strategy on failure"
URL : https://patchwork.freedesktop.org/series/89941/
State : failure
== Summary ==
Applying: Revert "drm/i915: Try to use fast+narrow link on eDP again and fall back to the old max strategy on failure"
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display_types.h
M drivers/gpu/drm/i915/display/intel_dp.c
Falling back to patching base and 3-way merge...
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/i915/display/intel_display_types.h
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/i915: Try to use fast+narrow link on eDP again and fall back to the old max strategy on failure"
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".
More information about the Intel-gfx
mailing list