== Series Details == Series: drm/i915/tgl: Simply subplatform detection (rev3) URL : https://patchwork.freedesktop.org/series/100517/ State : failure == Summary == Applying: drm/i915/tgl: Simply subplatform detection Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_reg.h M drivers/gpu/drm/i915/intel_device_info.c M drivers/gpu/drm/i915/intel_device_info.h M drivers/gpu/drm/i915/intel_step.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_device_info.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c Auto-merging drivers/gpu/drm/i915/i915_reg.h 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/tgl: Simply subplatform detection 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".
