== Series Details == Series: i915: Add QUIRK_EDP_CHANNEL_EQ for Dell 7200 2-in-1 URL : https://patchwork.freedesktop.org/series/83002/ State : failure == Summary == Applying: i915: Add QUIRK_EDP_CHANNEL_EQ for Dell 7200 2-in-1 Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_dp_link_training.c M drivers/gpu/drm/i915/i915_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_link_training.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 i915: Add QUIRK_EDP_CHANNEL_EQ for Dell 7200 2-in-1 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
