From: Patchwork <patchwork@emeril.freedesktop.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for series starting with [1/8] drm/i915: Rename execlists->queue_priority to preempt_priority_hint (rev2)
Date: Tue, 29 Jan 2019 16:29:14 -0000 [thread overview]
Message-ID: <20190129162914.5284.10427@emeril.freedesktop.org> (raw)
In-Reply-To: <20190129085824.12620-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [1/8] drm/i915: Rename execlists->queue_priority to preempt_priority_hint (rev2)
URL : https://patchwork.freedesktop.org/series/55886/
State : failure
== Summary ==
Applying: drm/i915: Rename execlists->queue_priority to preempt_priority_hint
Applying: drm/i915/execlists: Suppress preempting self
Applying: drm/i915/execlists: Suppress redundant preemption
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0003 drm/i915/execlists: Suppress redundant preemption
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-29 16:29 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 8:58 [PATCH 1/8] drm/i915: Rename execlists->queue_priority to preempt_priority_hint Chris Wilson
2019-01-29 8:58 ` [PATCH 2/8] drm/i915/execlists: Suppress preempting self Chris Wilson
2019-01-29 10:13 ` Tvrtko Ursulin
2019-01-29 10:22 ` Chris Wilson
2019-01-29 8:58 ` [PATCH 3/8] drm/i915/execlists: Suppress redundant preemption Chris Wilson
2019-01-29 11:15 ` Tvrtko Ursulin
2019-01-29 11:21 ` Chris Wilson
2019-01-29 12:26 ` Tvrtko Ursulin
2019-01-29 12:34 ` Chris Wilson
2019-01-29 15:27 ` [PATCH] " Chris Wilson
2019-01-29 8:58 ` [PATCH 4/8] drm/i915/selftests: Exercise some AB...BA preemption chains Chris Wilson
2019-01-29 8:58 ` [PATCH 5/8] drm/i915: Identify active requests Chris Wilson
2019-01-29 8:58 ` [PATCH 6/8] drm/i915: Remove the intel_engine_notify tracepoint Chris Wilson
2019-01-29 8:58 ` [PATCH 7/8] drm/i915: Replace global breadcrumbs with per-context interrupt tracking Chris Wilson
2019-01-29 8:58 ` [PATCH 8/8] drm/i915: Drop fake breadcrumb irq Chris Wilson
2019-01-29 9:40 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/8] drm/i915: Rename execlists->queue_priority to preempt_priority_hint Patchwork
2019-01-29 9:44 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-01-29 9:58 ` ✓ Fi.CI.BAT: success " Patchwork
2019-01-29 10:14 ` [PATCH 1/8] " Tvrtko Ursulin
2019-01-29 10:24 ` Chris Wilson
2019-01-29 10:41 ` Tvrtko Ursulin
2019-01-29 11:33 ` ✓ Fi.CI.IGT: success for series starting with [1/8] " Patchwork
2019-01-29 16:29 ` 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=20190129162914.5284.10427@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=chris@chris-wilson.co.uk \
--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