== Series Details == Series: Replace acronym with full platform name in defines. URL : https://patchwork.freedesktop.org/series/121385/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/121385/revisions/1/mbox/ not applied Applying: drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines Applying: drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines Applying: drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform defines Applying: drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/gen8_engine_cs.c M drivers/gpu/drm/i915/gt/intel_workarounds.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 drm/i915/kbl: s/KBL/KABYLAKE 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
