== Series Details == Series: Per context dynamic (sub)slice power-gating (rev6) URL : https://patchwork.freedesktop.org/series/48194/ State : failure == Summary == Applying: drm/i915/execlists: Move RPCS setup to context pin Applying: drm/i915: Record the sseu configuration per-context & engine Applying: drm/i915/perf: lock powergating configuration to default when active Applying: drm/i915: Add timeline barrier support Applying: drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only) Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_context.c M drivers/gpu/drm/i915/intel_lrc.c M include/uapi/drm/i915_drm.h Falling back to patching base and 3-way merge... Auto-merging include/uapi/drm/i915_drm.h Auto-merging drivers/gpu/drm/i915/intel_lrc.c Auto-merging drivers/gpu/drm/i915/i915_gem_context.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_context.c error: Failed to merge in the changes. Patch failed at 0005 drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only) 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
