== Series Details == Series: drm: Analog TV Improvements (rev3) URL : https://patchwork.freedesktop.org/series/107892/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/107892/revisions/3/mbox/ not applied Applying: drm/docs: Remove unused TV Standard property Applying: drm/tests: Order Kunit tests in Makefile Applying: drm/tests: Add Kunit Helpers Applying: drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity Applying: drm/connector: Rename subconnector state variable Applying: drm/atomic: Add TV subconnector property to get/set_property Applying: drm/connector: Rename legacy TV property Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_tv.c M include/drm/drm_connector.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_connector.h Auto-merging drivers/gpu/drm/i915/display/intel_tv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_tv.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0007 drm/connector: Rename legacy TV property 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".
