== Series Details == Series: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi URL : https://patchwork.freedesktop.org/series/95880/ State : failure == Summary == Applying: gpu/drm: make drm_add_edid_modes() consistent when updating connector->display_info Applying: drm/amdgpu: use drm_* functions instead of duplicated code in amdgpu driver Applying: drm/vc4: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Applying: drm/radeon: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Applying: drm/tegra: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Applying: drm/gma500: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Applying: drm/exynos: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Applying: drm/msm: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Applying: drm/sun4i: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Applying: drm/sti: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Applying: drm/zte: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi Using index info to reconstruct a base tree... A drivers/gpu/drm/zte/zx_hdmi.c Falling back to patching base and 3-way merge... CONFLICT (modify/delete): drivers/gpu/drm/zte/zx_hdmi.c deleted in HEAD and modified in drm/zte: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi. Version drm/zte: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi of drivers/gpu/drm/zte/zx_hdmi.c left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0011 drm/zte: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi 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".
