[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (rev2)

[Jani Nikula]

On Thu, 05 Mar 2020, Patchwork <patchwork at emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (rev2)
> URL   : https://patchwork.freedesktop.org/series/74100/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (v2)
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/drm_dp_helper.c
> M	drivers/gpu/drm/i915/display/intel_dp.c
> M	include/drm/drm_dp_helper.h
> Falling back to patching base and 3-way merge...
> Auto-merging include/drm/drm_dp_helper.h
> CONFLICT (content): Merge conflict in include/drm/drm_dp_helper.h
> Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
> Auto-merging drivers/gpu/drm/drm_dp_helper.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0001 drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (v2)
> 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".

I missed that this fails to apply, please rebase on top of current
drm-tip and repost.

Thanks,
Jani.


>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Graphics Center