== 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
