== Series Details == Series: drm/i915: Remove obj->mm.lock! (rev20) URL : https://patchwork.freedesktop.org/series/82337/ State : failure == Summary == Applying: drm/i915: Do not share hwsp across contexts any more, v8. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/gen2_engine_cs.c M drivers/gpu/drm/i915/gt/gen6_engine_cs.c M drivers/gpu/drm/i915/gt/gen8_engine_cs.c M drivers/gpu/drm/i915/gt/intel_engine_cs.c M drivers/gpu/drm/i915/gt/intel_gt_types.h M drivers/gpu/drm/i915/gt/intel_timeline.c M drivers/gpu/drm/i915/gt/intel_timeline_types.h M drivers/gpu/drm/i915/gt/selftest_engine_cs.c M drivers/gpu/drm/i915/gt/selftest_timeline.c M drivers/gpu/drm/i915/i915_request.c M drivers/gpu/drm/i915/i915_request.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_request.h Auto-merging drivers/gpu/drm/i915/i915_request.c Auto-merging drivers/gpu/drm/i915/gt/selftest_timeline.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_timeline.c Auto-merging drivers/gpu/drm/i915/gt/selftest_engine_cs.c Auto-merging drivers/gpu/drm/i915/gt/intel_timeline.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_timeline.c Auto-merging drivers/gpu/drm/i915/gt/intel_gt_types.h Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c Auto-merging drivers/gpu/drm/i915/gt/gen8_engine_cs.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915: Do not share hwsp across contexts any more, v8. 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
