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/5] drm/i915: Only enqueue already completed requests
Date: Tue, 06 Aug 2019 14:51:00 -0000 [thread overview]
Message-ID: <20190806145100.1117.3849@emeril.freedesktop.org> (raw)
In-Reply-To: <20190806134725.25321-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [1/5] drm/i915: Only enqueue already completed requests
URL : https://patchwork.freedesktop.org/series/64781/
State : failure
== Summary ==
Applying: drm/i915: Only enqueue already completed requests
Applying: drm/i915/execlists: Force preemption
Applying: drm/i915: Mark up "sentinel" requests
Applying: drm/i915/execlists: Cancel banned contexts on schedule-out
Applying: drm/i915: Cancel non-persistent contexts on close
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/Makefile
M drivers/gpu/drm/i915/gem/i915_gem_context.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0005 drm/i915: Cancel non-persistent contexts on close
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-08-06 14:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-06 13:47 [PATCH 1/5] drm/i915: Only enqueue already completed requests Chris Wilson
2019-08-06 13:47 ` [PATCH 2/5] drm/i915/execlists: Force preemption Chris Wilson
2019-08-06 13:47 ` [PATCH 3/5] drm/i915: Mark up "sentinel" requests Chris Wilson
2019-08-06 14:29 ` Mika Kuoppala
2019-08-06 14:47 ` Chris Wilson
2019-08-06 13:47 ` [PATCH 4/5] drm/i915/execlists: Cancel banned contexts on schedule-out Chris Wilson
2019-08-06 13:47 ` [PATCH 5/5] drm/i915: Cancel non-persistent contexts on close Chris Wilson
2019-08-06 14:11 ` Chris Wilson
2019-08-06 14:26 ` Bloomfield, Jon
2019-08-06 14:41 ` Chris Wilson
2019-08-07 13:22 ` Chris Wilson
2019-08-07 14:04 ` Bloomfield, Jon
2019-08-07 14:14 ` Chris Wilson
2019-08-07 14:33 ` Bloomfield, Jon
2019-08-07 15:08 ` Chris Wilson
2019-08-07 15:29 ` Bloomfield, Jon
2019-08-07 15:38 ` Chris Wilson
2019-08-07 16:51 ` Chris Wilson
2019-08-07 17:12 ` Bloomfield, Jon
2019-08-09 23:34 ` Chris Wilson
2019-08-12 14:39 ` Bloomfield, Jon
2019-08-12 14:51 ` Chris Wilson
2019-08-06 14:25 ` [PATCH 1/5] drm/i915: Only enqueue already completed requests Mika Kuoppala
2019-08-06 14:44 ` Chris Wilson
2019-08-06 14:51 ` 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=20190806145100.1117.3849@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.