From: Patchwork <patchwork@emeril.freedesktop.org>
To: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for Per context dynamic (sub)slice power-gating (rev13)
Date: Mon, 14 Jan 2019 12:32:25 -0000 [thread overview]
Message-ID: <20190114123225.24567.73461@emeril.freedesktop.org> (raw)
In-Reply-To: <20190108151252.4214-1-tvrtko.ursulin@linux.intel.com>
== Series Details ==
Series: Per context dynamic (sub)slice power-gating (rev13)
URL : https://patchwork.freedesktop.org/series/48194/
State : failure
== Summary ==
Applying: drm/i915/execlists: Move RPCS setup to context pin
Applying: drm/i915: Record the sseu configuration per-context & engine
Applying: drm/i915/perf: lock powergating configuration to default when active
Applying: drm/i915: Add timeline barrier support
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_request.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_request.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0004 drm/i915: Add timeline barrier support
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:[~2019-01-14 12:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 15:12 [PATCH 0/6] Per context dynamic (sub)slice power-gating Tvrtko Ursulin
2019-01-08 15:12 ` [PATCH 1/6] drm/i915/execlists: Move RPCS setup to context pin Tvrtko Ursulin
2019-01-08 15:12 ` [PATCH 2/6] drm/i915: Record the sseu configuration per-context & engine Tvrtko Ursulin
2019-01-08 15:12 ` [PATCH 3/6] drm/i915/perf: lock powergating configuration to default when active Tvrtko Ursulin
2019-01-08 15:12 ` [PATCH 4/6] drm/i915: Add timeline barrier support Tvrtko Ursulin
2019-01-08 15:12 ` [PATCH 5/6] drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only) Tvrtko Ursulin
2019-01-08 16:29 ` [PATCH v24 " Tvrtko Ursulin
2019-01-11 14:22 ` Tvrtko Ursulin
2019-01-14 9:39 ` [PATCH v25 " Tvrtko Ursulin
2019-01-08 15:12 ` [PATCH 6/6] drm/i915/selftests: Context SSEU reconfiguration tests Tvrtko Ursulin
2019-01-08 15:37 ` ✗ Fi.CI.CHECKPATCH: warning for Per context dynamic (sub)slice power-gating (rev11) Patchwork
2019-01-08 15:40 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-01-08 16:13 ` ✓ Fi.CI.BAT: success " Patchwork
2019-01-08 18:38 ` ✗ Fi.CI.CHECKPATCH: warning for Per context dynamic (sub)slice power-gating (rev12) Patchwork
2019-01-08 18:40 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-01-08 19:00 ` ✓ Fi.CI.BAT: success " Patchwork
2019-01-09 8:12 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-01-14 12:32 ` 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=20190114123225.24567.73461@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=tvrtko.ursulin@linux.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