From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Chris Wilson" <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [CI,01/12] drm/i915/gt: Move engine setup out of set_default_submission
Date: Wed, 03 Feb 2021 17:16:36 -0000 [thread overview]
Message-ID: <161237259696.943.6354872408153273432@emeril.freedesktop.org> (raw)
In-Reply-To: <20210203111806.7311-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [CI,01/12] drm/i915/gt: Move engine setup out of set_default_submission
URL : https://patchwork.freedesktop.org/series/86639/
State : failure
== Summary ==
Applying: drm/i915/gt: Move engine setup out of set_default_submission
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_execlists_submission.c
M drivers/gpu/drm/i915/gt/intel_ring_submission.c
M drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
Auto-merging drivers/gpu/drm/i915/gt/intel_ring_submission.c
Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_execlists_submission.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/gt: Move engine setup out of set_default_submission
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:[~2021-02-03 17:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 11:17 [Intel-gfx] [CI 01/12] drm/i915/gt: Move engine setup out of set_default_submission Chris Wilson
2021-02-03 11:17 ` [Intel-gfx] [CI 02/12] drm/i915/gt: Move submission_method into intel_gt Chris Wilson
2021-02-03 11:17 ` [Intel-gfx] [CI 03/12] drm/i915/gt: Move CS interrupt handler to the backend Chris Wilson
2021-02-03 11:17 ` [Intel-gfx] [CI 04/12] drm/i915: Replace engine->schedule() with a known request operation Chris Wilson
2021-02-03 11:17 ` [Intel-gfx] [CI 05/12] drm/i915: Restructure priority inheritance Chris Wilson
2021-02-03 11:18 ` [Intel-gfx] [CI 06/12] drm/i915/selftests: Measure set-priority duration Chris Wilson
2021-02-03 11:18 ` [Intel-gfx] [CI 07/12] drm/i915/selftests: Exercise priority inheritance around an engine loop Chris Wilson
2021-02-03 11:18 ` [Intel-gfx] [CI 08/12] drm/i915: Improve DFS for priority inheritance Chris Wilson
2021-02-03 11:18 ` [Intel-gfx] [CI 09/12] drm/i915: Extract request submission from execlists Chris Wilson
2021-02-03 11:18 ` [Intel-gfx] [CI 10/12] drm/i915: Extract request rewinding " Chris Wilson
2021-02-03 11:18 ` [Intel-gfx] [CI 11/12] drm/i915: Extract request suspension from the execlists Chris Wilson
2021-02-03 11:18 ` [Intel-gfx] [CI 12/12] drm/i915: Extract the ability to defer and rerun a request later Chris Wilson
2021-02-03 17:16 ` 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=161237259696.943.6354872408153273432@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.