From: Patchwork <patchwork@emeril.freedesktop.org>
To: cpaul@redhat.com
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Ro.CI.BAT: failure for series starting with [1/4] drm/i915/vlv: Make intel_crt_reset() per-encoder
Date: Mon, 22 Aug 2016 15:40:46 -0000 [thread overview]
Message-ID: <20160822154046.3036.83653@emeril.freedesktop.org> (raw)
In-Reply-To: <147152082520357@kroah.com>
== Series Details ==
Series: series starting with [1/4] drm/i915/vlv: Make intel_crt_reset() per-encoder
URL : https://patchwork.freedesktop.org/series/11422/
State : failure
== Summary ==
Applying: drm/i915/vlv: Make intel_crt_reset() per-encoder
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_crt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_crt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_crt.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915/vlv: Make intel_crt_reset() per-encoder
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
prev parent reply other threads:[~2016-08-22 15:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 11:47 FAILED: patch "[PATCH] drm/i915/vlv: Disable HPD in valleyview_crt_detect_hotplug()" failed to apply to 4.7-stable tree gregkh
2016-08-22 15:31 ` [PATCH 0/4] Backported vlv fixes for 4.7.y Lyude
2016-08-22 15:31 ` Lyude
2016-08-22 15:31 ` [PATCH 1/4] drm/i915/vlv: Make intel_crt_reset() per-encoder Lyude
2016-08-22 15:31 ` Lyude
2016-08-22 15:31 ` [PATCH 2/4] drm/i915/vlv: Reset the ADPA in vlv_display_power_well_init() Lyude
2016-08-22 15:31 ` Lyude
2016-08-22 15:31 ` [PATCH 3/4] drm/i915/vlv: Disable HPD in valleyview_crt_detect_hotplug() Lyude
2016-08-22 15:31 ` Lyude
2016-08-22 15:31 ` [PATCH 4/4] drm/i915: Enable polling when we don't have hpd Lyude
2016-08-22 15:31 ` Lyude
2016-08-22 20:33 ` [PATCH 0/4] Backported vlv fixes for 4.7.y Greg KH
2016-08-22 20:33 ` Greg KH
2016-08-29 21:27 ` Lyude Paul
2016-08-29 21:27 ` Lyude Paul
2016-09-05 13:01 ` Greg KH
2016-09-05 13:01 ` Greg KH
2016-08-22 15:40 ` 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=20160822154046.3036.83653@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=cpaul@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.