== Series Details == Series: series starting with [01/21] drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h (rev3) URL : https://patchwork.freedesktop.org/series/58065/ State : failure == Summary == Applying: drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h Applying: drm/i915: Sanity check mmap length against object size Applying: drm/i915: Hold a ref to the ring while retiring Applying: drm/i915: Lock the gem_context->active_list while dropping the link Applying: drm/i915: Hold a reference to the active HW context Applying: drm/i915: Stop needlessly acquiring wakeref for debugfs/drop_caches_set Applying: drm/i915/selftests: Provide stub reset functions Applying: drm/i915: Switch to use HWS indices rather than addresses Applying: drm/i915: Separate GEM context construction and registration to userspace Applying: drm/i915: Introduce a mutex for file_priv->context_idr Applying: drm/i915: Introduce the i915_user_extension_method Applying: drm/i915: Create/destroy VM (ppGTT) for use with contexts Applying: drm/i915: Extend CONTEXT_CREATE to set parameters upon construction Applying: drm/i915: Allow contexts to share a single timeline across all engines Applying: drm/i915: Allow userspace to clone contexts on creation Applying: drm/i915: Allow a context to define its set of engines Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_context.c Falling back to patching base and 3-way merge... 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. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0016 drm/i915: Allow a context to define its set of engines 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
