From: Patchwork <patchwork@annarchy.freedesktop.org>
To: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for PSR link standby x link force off changes.
Date: Tue, 02 Feb 2016 07:31:24 -0000 [thread overview]
Message-ID: <20160202073124.28739.70785@annarchy.freedesktop.org> (raw)
In-Reply-To: <1454352549-2411-1-git-send-email-rodrigo.vivi@intel.com>
== Summary ==
Series 2991v1 PSR link standby x link force off changes.
2016-02-01T18:49:22.338593 http://patchwork.freedesktop.org/api/1.0/series/2991/revisions/1/mbox/
Applying: drm/i915: PSR simplify port and link standby checks.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_psr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_psr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_psr.c
Patch failed at 0001 drm/i915: PSR simplify port and link standby checks.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2016-02-02 7:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-01 18:49 [PATCH 0/3] PSR link standby x link force off changes Rodrigo Vivi
2016-02-01 18:49 ` [PATCH 1/3] drm/i915: PSR simplify port and link standby checks Rodrigo Vivi
2016-02-01 18:49 ` [PATCH 2/3] drm/i915: Add PSR main link standby support back Rodrigo Vivi
2016-02-01 18:49 ` [PATCH 3/3] drm/i915: Instrument PSR parameter for debuging with link standby x link off Rodrigo Vivi
2016-02-01 19:47 ` Zanoni, Paulo R
2016-02-02 7:31 ` 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=20160202073124.28739.70785@annarchy.freedesktop.org \
--to=patchwork@annarchy.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/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).