== Series Details == Series: Add ChromeOS EC CEC Support (rev9) URL : https://patchwork.freedesktop.org/series/43162/ State : failure == Summary == Applying: media: cec-notifier: Get notifier by device and connector name Applying: drm/i915: hdmi: add CEC notifier to intel_hdmi Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_display.h M drivers/gpu/drm/i915/intel_drv.h M drivers/gpu/drm/i915/intel_hdmi.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_hdmi.c Auto-merging drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/intel_display.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.h error: Failed to merge in the changes. Patch failed at 0002 drm/i915: hdmi: add CEC notifier to intel_hdmi Use 'git am --show-current-patch' to see the failed 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
