== Series Details ==

Series: Implement Wa_14021768792 to bypass m_n ratio limit (rev9)
URL   : https://patchwork.freedesktop.org/series/138257/
State : failure

== Summary ==

Error: patch 
https://patchwork.freedesktop.org/api/1.0/series/138257/revisions/9/mbox/ not 
applied
Applying: drm/i915/display: Add helper to compute link M/N ratio for reuse
Applying: drm/i915/dp: Limit M/N ratio for DP SST
Using index info to reconstruct a base tree...
M       drivers/gpu/drm/i915/display/intel_display.c
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.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915/dp: Limit M/N ratio for DP SST
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


Reply via email to