From: Patchwork <patchwork@emeril.freedesktop.org>
To: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for Forward Error Correction
Date: Tue, 07 Aug 2018 23:22:37 -0000 [thread overview]
Message-ID: <20180807232237.1839.64967@emeril.freedesktop.org> (raw)
In-Reply-To: <1533683132-21625-1-git-send-email-anusha.srivatsa@intel.com>
== Series Details ==
Series: Forward Error Correction
URL : https://patchwork.freedesktop.org/series/47848/
State : failure
== Summary ==
Applying: drm/dp/fec: DRM helper for Forward Error Correction
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_dp_helper.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
Auto-merging drivers/gpu/drm/drm_dp_helper.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/dp/fec: DRM helper for Forward Error Correction
Use 'git am --show-current-patch' to see the failed patch
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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2018-08-07 23:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-07 23:05 [PATCH 0/5] Forward Error Correction Anusha Srivatsa
2018-08-07 23:05 ` [PATCH 1/5] drm/dp/fec: DRM helper for " Anusha Srivatsa
2018-08-17 9:51 ` Jani Nikula
2018-08-20 19:32 ` Manasi Navare
2018-08-21 16:30 ` Srivatsa, Anusha
2018-08-21 23:22 ` Srivatsa, Anusha
2018-08-07 23:05 ` [PATCH 2/5] i915/dp/fec: Check for FEC Support Anusha Srivatsa
2018-08-07 23:05 ` [PATCH 3/5] drm/i915/fec: Set FEC_READY in FEC_CONFIGURATION Anusha Srivatsa
2018-08-07 23:05 ` [PATCH 4/5] i915/dp/fec: Configure the Forward Error Correction bits Anusha Srivatsa
2018-08-07 23:05 ` [PATCH 5/5] drm/i915/fec: Disable FEC state Anusha Srivatsa
2018-08-07 23:17 ` Chris Wilson
2018-08-07 23:22 ` Patchwork [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=20180807232237.1839.64967@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=anusha.srivatsa@intel.com \
--cc=intel-gfx@lists.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;
as well as URLs for NNTP newsgroup(s).