From: Jani Nikula <jani.nikula@linux.intel.com>
To: Patchwork <patchwork@emeril.freedesktop.org>,
Mario Kleiner <mario.kleiner.de@gmail.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (rev2)
Date: Wed, 11 Mar 2020 12:47:03 +0200 [thread overview]
Message-ID: <87r1xzkw2g.fsf@intel.com> (raw)
In-Reply-To: <158343831517.17237.10748442764769008781@emeril.freedesktop.org>
On Thu, 05 Mar 2020, Patchwork <patchwork@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2020-03-11 10:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 8:12 [Intel-gfx] [PATCH] drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (v2) Mario Kleiner
2020-03-05 8:35 ` Jani Nikula
2020-03-05 8:37 ` Jani Nikula
2020-03-05 19:58 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (rev2) Patchwork
2020-03-11 10:47 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r1xzkw2g.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=mario.kleiner.de@gmail.com \
--cc=patchwork@emeril.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox