== Series Details == Series: series starting with [v2,1/2] drm: Add HPD state to drm_connector_oob_hotplug_event() URL : https://patchwork.freedesktop.org/series/101048/ State : failure == Summary == Applying: drm: Add HPD state to drm_connector_oob_hotplug_event() Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_connector.c M drivers/gpu/drm/i915/display/intel_dp.c M drivers/gpu/drm/i915/i915_drv.h M include/drm/drm_connector.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_connector.h CONFLICT (content): Merge conflict in include/drm/drm_connector.h Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/display/intel_dp.c Auto-merging drivers/gpu/drm/drm_connector.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: Add HPD state to drm_connector_oob_hotplug_event() 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".
