== Series Details == Series: drm/i915/gem: ioctl clean-ups (rev5) URL : https://patchwork.freedesktop.org/series/89443/ State : failure == Summary == Applying: drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE Applying: drm/i915: Stop storing the ring size in the ring pointer (v2) Applying: drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP Applying: drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem (v2) Applying: drm/i915/gem: Return void from context_apply_all Applying: drm/i915: Drop the CONTEXT_CLONE API (v2) Applying: drm/i915: Implement SINGLE_TIMELINE with a syncobj (v4) Applying: drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES Applying: drm/i915/gem: Disallow bonding of virtual engines (v3) Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_execlists_submission.c M drivers/gpu/drm/i915/gt/intel_execlists_submission.h M drivers/gpu/drm/i915/gt/selftest_execlists.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/selftest_execlists.c Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_execlists_submission.h Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0009 drm/i915/gem: Disallow bonding of virtual engines (v3) 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
