From: Patchwork <patchwork@emeril.freedesktop.org>
To: Imre Deak <imre.deak@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for series starting with [RFC,1/8] drm/i915: Introduce intel_runtime_pm_disable to pair intel_runtime_pm_enable (rev2)
Date: Fri, 10 Aug 2018 12:38:12 -0000 [thread overview]
Message-ID: <20180810123812.8595.69518@emeril.freedesktop.org> (raw)
In-Reply-To: <20180810071138.30138-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [RFC,1/8] drm/i915: Introduce intel_runtime_pm_disable to pair intel_runtime_pm_enable (rev2)
URL : https://patchwork.freedesktop.org/series/47989/
State : failure
== Summary ==
Applying: drm/i915: Introduce intel_runtime_pm_disable to pair intel_runtime_pm_enable
Applying: drm/i915: Track all held rpm wakerefs
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.c
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/intel_drv.h
M drivers/gpu/drm/i915/intel_runtime_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
error: Failed to merge in the changes.
Patch failed at 0002 drm/i915: Track all held rpm wakerefs
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-10 12:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 7:11 [RFC 1/8] drm/i915: Introduce intel_runtime_pm_disable to pair intel_runtime_pm_enable Chris Wilson
2018-08-10 7:11 ` [RFC 2/8] drm/i915: Track all held rpm wakerefs Chris Wilson
2018-08-10 7:11 ` [RFC 3/8] drm/i915: Markup paired operations on wakerefs Chris Wilson
2018-08-10 7:11 ` [RFC 4/8] drm/i915: Syntatic sugar for using intel_runtime_pm Chris Wilson
2018-08-10 7:11 ` [RFC 5/8] drm/i915: Markup paired operations on display power domains Chris Wilson
2018-08-10 7:11 ` [RFC 6/8] drm/i915/dp: Markup pps lock power well Chris Wilson
2018-08-10 7:11 ` [RFC 7/8] drm/i915: Complain is hsw_get_pipe_config acquires the same power well twice Chris Wilson
2018-08-10 7:11 ` [RFC 8/8] drm/i915: Track crtc wakerefs during modesetting Chris Wilson
2018-08-10 11:51 ` ✗ Fi.CI.BAT: failure for series starting with [RFC,1/8] drm/i915: Introduce intel_runtime_pm_disable to pair intel_runtime_pm_enable Patchwork
2018-08-10 12:22 ` [RFC 1/8] " Imre Deak
2018-08-10 12:33 ` Chris Wilson
2018-08-10 14:01 ` Imre Deak
2018-08-10 12:38 ` 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=20180810123812.8595.69518@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=imre.deak@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).