== Series Details == Series: rename GEN6_PCODE_DATA to match spec URL : https://patchwork.freedesktop.org/series/160550/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/160550/revisions/1/mbox/ not applied Applying: drm/{i915, xe}/pcode: rename GEN6_PCODE_DATA to match spec Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_parent.c M drivers/gpu/drm/i915/display/intel_parent.h M drivers/gpu/drm/i915/intel_pcode.c M drivers/gpu/drm/i915/intel_pcode.h A drivers/gpu/drm/xe/display/xe_display_pcode.c M drivers/gpu/drm/xe/xe_pcode.c M drivers/gpu/drm/xe/xe_pcode.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_pcode.h Auto-merging drivers/gpu/drm/xe/xe_pcode.c CONFLICT (modify/delete): drivers/gpu/drm/xe/display/xe_display_pcode.c deleted in HEAD and modified in drm/{i915, xe}/pcode: rename GEN6_PCODE_DATA to match spec. Version drm/{i915, xe}/pcode: rename GEN6_PCODE_DATA to match spec of drivers/gpu/drm/xe/display/xe_display_pcode.c left in tree. Auto-merging drivers/gpu/drm/i915/intel_pcode.h Auto-merging drivers/gpu/drm/i915/intel_pcode.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pcode.c Auto-merging drivers/gpu/drm/i915/display/intel_parent.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_parent.h Auto-merging drivers/gpu/drm/i915/display/intel_parent.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_parent.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, xe}/pcode: rename GEN6_PCODE_DATA to match spec 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
