== Series Details == Series: Handle BPC for HDMI2.1 PCON without DSC1.2 sink and other fixes (rev9) URL : https://patchwork.freedesktop.org/series/107550/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/107550/revisions/9/mbox/ not applied Applying: drm/i915/display: Add new member to configure PCON color conversion Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/icl_dsi.c M drivers/gpu/drm/i915/display/intel_crt.c M drivers/gpu/drm/i915/display/intel_crtc_state_dump.c M drivers/gpu/drm/i915/display/intel_display.c M drivers/gpu/drm/i915/display/intel_display_types.h M drivers/gpu/drm/i915/display/intel_dp.c M drivers/gpu/drm/i915/display/intel_dp_mst.c M drivers/gpu/drm/i915/display/intel_dvo.c M drivers/gpu/drm/i915/display/intel_hdmi.c M drivers/gpu/drm/i915/display/intel_lvds.c M drivers/gpu/drm/i915/display/intel_tv.c 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 Auto-merging drivers/gpu/drm/i915/display/intel_tv.c Auto-merging drivers/gpu/drm/i915/display/intel_lvds.c Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c Auto-merging drivers/gpu/drm/i915/display/intel_dvo.c Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c Auto-merging drivers/gpu/drm/i915/display/intel_dp.c Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c Auto-merging drivers/gpu/drm/i915/display/intel_crtc_state_dump.c Auto-merging drivers/gpu/drm/i915/display/intel_crt.c Auto-merging 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/display: Add new member to configure PCON color conversion 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".
