== Series Details == Series: Replace acronym with full platform name in defines. (rev3) URL : https://patchwork.freedesktop.org/series/119380/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/119380/revisions/3/mbox/ not applied Applying: drm/i915/mtl: s/MTL/METEORLAKE for platform/subplatform defines Applying: drm/i915/MTL: s/MTL/METEORLAKE for platform/subplatform defines Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_fbc.c M drivers/gpu/drm/i915/display/intel_pmdemand.c M drivers/gpu/drm/i915/display/intel_psr.c M drivers/gpu/drm/i915/display/skl_universal_plane.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_execlists_submission.c M drivers/gpu/drm/i915/gt/intel_gt_mcr.c M drivers/gpu/drm/i915/gt/intel_lrc.c M drivers/gpu/drm/i915/gt/intel_rc6.c M drivers/gpu/drm/i915/gt/intel_workarounds.c M drivers/gpu/drm/i915/gt/uc/intel_guc.c M drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_perf.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_perf.c Auto-merging drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc.c Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c Auto-merging drivers/gpu/drm/i915/gt/intel_gt_mcr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_mcr.c Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_execlists_submission.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 Auto-merging drivers/gpu/drm/i915/gt/gen8_engine_cs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/gen8_engine_cs.c Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/skl_universal_plane.c Auto-merging drivers/gpu/drm/i915/display/intel_psr.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/MTL: s/MTL/METEORLAKE for platform/subplatform defines 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
