== Series Details == Series: Refactor and Add helper function for combophy/tc ports (rev3) URL : https://patchwork.freedesktop.org/series/50484/ State : failure == Summary == Applying: drm/i915/icl: create function to identify combophy port Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_ddi.c M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/intel_ddi.c Applying: drm/i915/icl: use combophy/TC helper functions during display detection Applying: drm/i915/icl: Refactor get_ddi_pll using helper func Applying: drm/i915/icl: Use helper functions to classify the ports Applying: drm/i915/icl: Refactor icl pll functions Applying: drm/i915/icl: Combine all port/combophy macros at one place Applying: drm/i915/icl: Introduce new macros to get combophy registers Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_reg.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_reg.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h error: Failed to merge in the changes. Patch failed at 0007 drm/i915/icl: Introduce new macros to get combophy registers Use 'git am --show-current-patch' to see the failed patch 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
