== Series Details == Series: series starting with [01/33] drm/i915: Restore control over ppgtt for context creation ABI URL : https://patchwork.freedesktop.org/series/60842/ State : failure == Summary == Applying: drm/i915: Restore control over ppgtt for context creation ABI Applying: drm/i915: Allow a context to define its set of engines Applying: drm/i915: Extend I915_CONTEXT_PARAM_SSEU to support local ctx->engine[] Applying: drm/i915: Re-expose SINGLE_TIMELINE flags for context creation Applying: drm/i915: Allow userspace to clone contexts on creation Applying: drm/i915: Load balancing across a virtual engine Applying: drm/i915: Apply an execution_mask to the virtual_engine Applying: drm/i915: Extend execution fence to support a callback Applying: drm/i915/execlists: Virtual engine bonding Applying: drm/i915: Allow specification of parallel execbuf Applying: drm/i915: Split GEM object type definition to its own header Applying: drm/i915: Pull GEM ioctls interface to its own file Applying: drm/i915: Move object->pages API to i915_gem_object.[ch] Applying: drm/i915: Move shmem object setup to its own file Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0014 drm/i915: Move shmem object setup to its own file 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
