== Series Details == Series: series starting with [1/6] drm/i915: Limit C-states when waiting for the active request (rev2) URL : https://patchwork.freedesktop.org/series/47739/ State : failure == Summary == Applying: drm/i915: Limit C-states when waiting for the active request Applying: drm/i915: Reserve some priority bits for internal use Applying: drm/i915: Combine multiple internal plists into the same i915_priolist bucket Applying: drm/i915: Priority boost for new clients Applying: drm/i915: Pull scheduling under standalone lock Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_lrc.c M drivers/gpu/drm/i915/intel_ringbuffer.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h Auto-merging drivers/gpu/drm/i915/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c error: Failed to merge in the changes. Patch failed at 0005 drm/i915: Pull scheduling under standalone lock 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
