All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Matthew Brost" <matthew.brost@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce i915_sched_engine object (rev4)
Date: Tue, 15 Jun 2021 22:11:52 -0000	[thread overview]
Message-ID: <162379511289.8818.14981738416304613749@emeril.freedesktop.org> (raw)
In-Reply-To: <20210615205900.26578-1-matthew.brost@intel.com>

== Series Details ==

Series: Introduce i915_sched_engine object (rev4)
URL   : https://patchwork.freedesktop.org/series/90630/
State : failure

== Summary ==

Applying: drm/i915: Move priolist to new i915_sched_engine object
Applying: drm/i915: Add i915_sched_engine_is_empty function
Applying: drm/i915: Reset sched_engine.no_priolist immediately after dequeue
Applying: drm/i915: Move active tracking to i915_sched_engine
Applying: drm/i915: Move engine->schedule to i915_sched_engine
Applying: drm/i915: Add kick_backend function to i915_sched_engine
Applying: drm/i915: Update i915_scheduler to operate on i915_sched_engine
Applying: drm/i915: Move submission tasklet to i915_sched_engine
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/selftest_execlists.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/selftest_execlists.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_execlists.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 drm/i915: Move submission tasklet to i915_sched_engine
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

      parent reply	other threads:[~2021-06-15 22:11 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-15 20:58 [PATCH 0/8] Introduce i915_sched_engine object Matthew Brost
2021-06-15 20:58 ` [Intel-gfx] " Matthew Brost
2021-06-15 20:58 ` [PATCH 1/8] drm/i915: Move priolist to new " Matthew Brost
2021-06-15 20:58   ` [Intel-gfx] " Matthew Brost
2021-06-15 20:58 ` [PATCH 2/8] drm/i915: Add i915_sched_engine_is_empty function Matthew Brost
2021-06-15 20:58   ` [Intel-gfx] " Matthew Brost
2021-06-15 20:58 ` [PATCH 3/8] drm/i915: Reset sched_engine.no_priolist immediately after dequeue Matthew Brost
2021-06-15 20:58   ` [Intel-gfx] " Matthew Brost
2021-06-15 20:58 ` [PATCH 4/8] drm/i915: Move active tracking to i915_sched_engine Matthew Brost
2021-06-15 20:58   ` [Intel-gfx] " Matthew Brost
2021-06-15 20:58 ` [PATCH 5/8] drm/i915: Move engine->schedule " Matthew Brost
2021-06-15 20:58   ` [Intel-gfx] " Matthew Brost
2021-06-15 20:58 ` [PATCH 6/8] drm/i915: Add kick_backend function " Matthew Brost
2021-06-15 20:58   ` [Intel-gfx] " Matthew Brost
2021-06-15 20:58 ` [PATCH 7/8] drm/i915: Update i915_scheduler to operate on i915_sched_engine Matthew Brost
2021-06-15 20:58   ` [Intel-gfx] " Matthew Brost
2021-06-15 20:59 ` [PATCH 8/8] drm/i915: Move submission tasklet to i915_sched_engine Matthew Brost
2021-06-15 20:59   ` [Intel-gfx] " Matthew Brost
2021-06-15 23:57   ` Daniele Ceraolo Spurio
2021-06-15 23:57     ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-06-15 22:11 ` 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=162379511289.8818.14981738416304613749@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=matthew.brost@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 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.