== Series Details == Series: series starting with [1/3] drm/i915/dp: Free the drm_dp_aux along with the encoder URL : https://patchwork.freedesktop.org/series/8847/ State : failure == Summary == Applying: drm/i915/dp: Free the drm_dp_aux along with the encoder Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_dp.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Move intel_connector->unregister to connector->early_unregister Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/intel_crt.c M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_dp.c M drivers/gpu/drm/i915/intel_dp_mst.c M drivers/gpu/drm/i915/intel_drv.h M drivers/gpu/drm/i915/intel_dsi.c M drivers/gpu/drm/i915/intel_dvo.c M drivers/gpu/drm/i915/intel_hdmi.c M drivers/gpu/drm/i915/intel_lvds.c M drivers/gpu/drm/i915/intel_sdvo.c M drivers/gpu/drm/i915/intel_tv.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_dp.c Auto-merging drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c error: Failed to merge in the changes. Patch failed at 0002 drm/i915: Move intel_connector->unregister to connector->early_unregister The copy of the patch that failed is found in: .git/rebase-apply/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
