From: Patchwork <patchwork@emeril.freedesktop.org>
To: cpaul@redhat.com
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Ro.CI.BAT: failure for Finally fix watermarks (rev11)
Date: Mon, 22 Aug 2016 16:50:48 -0000 [thread overview]
Message-ID: <20160822165048.3033.7370@emeril.freedesktop.org> (raw)
In-Reply-To: <1471463761-26796-1-git-send-email-cpaul@redhat.com>
== Series Details ==
Series: Finally fix watermarks (rev11)
URL : https://patchwork.freedesktop.org/series/10276/
State : failure
== Summary ==
Applying: drm/i915/gen6+: Interpret mailbox error flags
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_reg.h
M drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915/gen6+: Interpret mailbox error flags
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 16:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-17 19:55 [PATCH v12 0/7] Finally fix watermarks Lyude
2016-08-17 19:55 ` [PATCH v12 1/7] drm/i915/gen6+: Interpret mailbox error flags Lyude
2016-08-17 19:55 ` [PATCH v12 2/7] drm/i915/skl: Add support for the SAGV, fix underrun hangs Lyude
2016-08-18 7:39 ` Maarten Lankhorst
2016-08-18 14:05 ` Lyude Paul
2016-08-22 7:27 ` Maarten Lankhorst
2016-08-17 19:55 ` [PATCH v12 3/7] drm/i915/gen9: Only copy WM results for changed pipes to skl_hw Lyude
2016-08-17 19:55 ` [PATCH v12 4/7] drm/i915/skl: Update plane watermarks atomically during plane updates Lyude
2016-08-22 11:24 ` Maarten Lankhorst
2016-08-22 16:50 ` [PATCH v13 " Lyude
2016-08-23 10:16 ` Maarten Lankhorst
2016-08-23 14:12 ` [RESEND PATCH v13 6/7] drm/i915: Move CRTC updating in atomic_commit into it's own hook Lyude
2016-08-23 14:12 ` [RESEND PATCH v13 7/7] drm/i915/skl: Update DDB values atomically with wms/plane attrs Lyude
2016-08-17 19:55 ` [PATCH v12 5/7] drm/i915/skl: Ensure pipes with changed wms get added to the state Lyude
2016-09-20 18:38 ` Mike Lothian
2016-09-20 18:45 ` Mike Lothian
2016-09-21 6:56 ` Maarten Lankhorst
2016-09-21 7:03 ` Mike Lothian
2016-09-21 11:34 ` Mike Lothian
2016-09-26 13:57 ` Mike Lothian
2016-08-17 19:55 ` [PATCH v12 6/7] drm/i915: Move CRTC updating in atomic_commit into it's own hook Lyude
2016-08-17 19:55 ` [PATCH v12 7/7] drm/i915/skl: Update DDB values atomically with wms/plane attrs Lyude
2016-08-18 7:14 ` ✗ Ro.CI.BAT: failure for Finally fix watermarks (rev10) Patchwork
2016-08-22 16:50 ` 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=20160822165048.3033.7370@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 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).