== Series Details == Series: drm/i915: Context aware user agnostic EU/Slice/Sub-slice control within kernel (rev2) URL : https://patchwork.freedesktop.org/series/57989/ State : failure == Summary == Applying: drm/i915: Get active pending request for given context Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_context.c M drivers/gpu/drm/i915/gem/i915_gem_context_types.h M drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c M drivers/gpu/drm/i915/gt/intel_lrc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context_types.h Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915: Get active pending request for given context 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
