== Series Details == Series: Dual LFP/EDP enablement (rev2) URL : https://patchwork.freedesktop.org/series/104663/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/104663/revisions/2/mbox/ not applied Applying: drm/i915/bios: calculate drrs mode using panel index for dual LFP Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/icl_dsi.c M drivers/gpu/drm/i915/display/intel_bios.c M drivers/gpu/drm/i915/display/intel_bios.h M drivers/gpu/drm/i915/display/intel_dp.c M drivers/gpu/drm/i915/display/intel_lvds.c M drivers/gpu/drm/i915/display/intel_sdvo.c M drivers/gpu/drm/i915/display/intel_vbt_defs.h M drivers/gpu/drm/i915/display/vlv_dsi.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c Auto-merging drivers/gpu/drm/i915/display/intel_vbt_defs.h Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_sdvo.c Auto-merging drivers/gpu/drm/i915/display/intel_lvds.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_lvds.c Auto-merging drivers/gpu/drm/i915/display/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c Auto-merging drivers/gpu/drm/i915/display/intel_bios.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bios.h Auto-merging drivers/gpu/drm/i915/display/intel_bios.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bios.c Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/icl_dsi.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/bios: calculate drrs mode using panel index for dual LFP 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".
