From: Patchwork <patchwork@emeril.freedesktop.org>
To: Pandiyan@emeril.freedesktop.org,
Dhinakaran <dhinakaran.pandiyan@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Ro.CI.BAT: failure for drm/i915/dp: DP audio API changes for MST
Date: Wed, 03 Aug 2016 06:25:23 -0000 [thread overview]
Message-ID: <20160803062523.23875.57842@emeril.freedesktop.org> (raw)
In-Reply-To: <1470190470-32326-1-git-send-email-dhinakaran.pandiyan@intel.com>
== Series Details ==
Series: drm/i915/dp: DP audio API changes for MST
URL : https://patchwork.freedesktop.org/series/10571/
State : failure
== Summary ==
Applying: drm/i915/dp: DP audio API changes for MST
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_audio.c
M sound/pci/hda/patch_hdmi.c
Falling back to patching base and 3-way merge...
Auto-merging sound/pci/hda/patch_hdmi.c
Auto-merging drivers/gpu/drm/i915/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_audio.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915/dp: DP audio API changes for MST
The copy of the patch that failed is found in: .git/rebase-apply/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
next prev parent reply other threads:[~2016-08-03 6:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-03 2:14 DP audio API changes for identifying displays connected to a port Dhinakaran Pandiyan
2016-08-03 2:14 ` [PATCH] drm/i915/dp: DP audio API changes for MST Dhinakaran Pandiyan
2016-08-03 13:53 ` Takashi Iwai
2016-08-03 18:52 ` Pandiyan, Dhinakaran
2016-08-03 19:08 ` Ville Syrjälä
2016-08-03 19:43 ` Pandiyan, Dhinakaran
2016-08-03 20:28 ` Ville Syrjälä
2016-08-03 21:42 ` Pandiyan, Dhinakaran
2016-08-04 12:49 ` Ville Syrjälä
2016-08-04 16:44 ` Pandiyan, Dhinakaran
2016-08-04 17:18 ` Jim Bride
2016-08-04 17:35 ` Ville Syrjälä
2016-08-04 17:55 ` Takashi Iwai
2016-08-04 20:48 ` Ville Syrjälä
2016-08-05 2:31 ` Yang, Libin
2016-08-05 7:46 ` Pandiyan, Dhinakaran
2016-08-05 8:51 ` Ville Syrjälä
2016-08-05 2:35 ` Yang, Libin
2016-08-05 5:57 ` Pandiyan, Dhinakaran
2016-08-05 6:21 ` Yang, Libin
2016-08-05 6:41 ` Pandiyan, Dhinakaran
2016-08-05 6:43 ` Yang, Libin
2016-08-03 6:25 ` Patchwork [this message]
2016-08-03 13:47 ` DP audio API changes for identifying displays connected to a port Takashi Iwai
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=20160803062523.23875.57842@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=Pandiyan@emeril.freedesktop.org \
--cc=dhinakaran.pandiyan@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