== Series Details == Series: series starting with [RESEND,1/3] drm/i915/dmc: abstract GPU error state dump URL : https://patchwork.freedesktop.org/series/101957/ State : failure == Summary == Applying: drm/i915/dmc: abstract GPU error state dump Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_dmc.c M drivers/gpu/drm/i915/display/intel_dmc.h M drivers/gpu/drm/i915/i915_gpu_error.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c Auto-merging drivers/gpu/drm/i915/display/intel_dmc.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.h Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.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/dmc: abstract GPU error state dump 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".
