== Series Details == Series: Update GGTT with MI_UPDATE_GTT on MTL (rev12) URL : https://patchwork.freedesktop.org/series/123329/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/123329/revisions/12/mbox/ not applied Applying: drm/i915: Lift runtime-pm acquire callbacks out of intel_wakeref.mutex Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_wakeref.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Create a kernel context for GGTT updates Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_engine.h M drivers/gpu/drm/i915/gt/intel_engine_cs.c M drivers/gpu/drm/i915/gt/intel_engine_types.h M drivers/gpu/drm/i915/gt/intel_gt.c M drivers/gpu/drm/i915/gt/intel_gt.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_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 0002 drm/i915: Create a kernel context for GGTT updates 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". Build failed, no error log produced
