== Series Details == Series: series starting with [1/9] drm/i915/execlists: Avoid kicking priority on the current context (rev2) URL : https://patchwork.freedesktop.org/series/48936/ State : failure == Summary == Applying: drm/i915/execlists: Avoid kicking priority on the current context Applying: drm/i915: Missed interrupt simulation is no more, tell the world Applying: drm/i915/selftests: Basic stress test for rapid context switching Applying: drm/i915/execlists: Delay updating ring register state after resume Applying: drm/i915/execlists: Use coherent writes into the context image Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/i915_perf.c M drivers/gpu/drm/i915/intel_engine_cs.c M drivers/gpu/drm/i915/intel_lrc.c M drivers/gpu/drm/i915/intel_ringbuffer.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c Auto-merging drivers/gpu/drm/i915/intel_lrc.c Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c Auto-merging drivers/gpu/drm/i915/i915_perf.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_perf.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_drv.h error: Failed to merge in the changes. Patch failed at 0005 drm/i915/execlists: Use coherent writes into the context image Use 'git am --show-current-patch' to see the failed patch 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
