== Series Details == Series: series starting with drm/i915/dp: Fix dsc bpp calculations, v4. (rev3) URL : https://patchwork.freedesktop.org/series/66998/ State : failure == Summary == Applying: drm/i915/dp: Fix dsc bpp calculations, v4. Applying: HAX drm/i915: Disable FEC entirely for now Applying: drm/i915: Prepare to split crtc state in uapi and hw state Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_audio.c M drivers/gpu/drm/i915/display/intel_color.c M drivers/gpu/drm/i915/display/intel_ddi.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_dpll_mgr.c M drivers/gpu/drm/i915/display/intel_hdmi.c M drivers/gpu/drm/i915/i915_debugfs.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.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_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c Auto-merging drivers/gpu/drm/i915/display/intel_color.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_color.c Auto-merging drivers/gpu/drm/i915/display/intel_audio.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 drm/i915: Prepare to split crtc state in uapi and hw state 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
