== Series Details == Series: drm/i915: Infoframe precompute/check (rev2) URL : https://patchwork.freedesktop.org/series/49983/ State : failure == Summary == Applying: video/hdmi: Constify 'buffer' to the unpack functions Applying: video/hdmi: Pass buffer size to infoframe unpack functions Applying: video/hdmi: Constify infoframe passed to the log functions Applying: video/hdmi: Constify infoframe passed to the pack functions Applying: video/hdmi: Add an enum for HDMI packet types Applying: video/hdmi: Handle the MPEG Source infoframe Using index info to reconstruct a base tree... M drivers/video/hdmi.c Falling back to patching base and 3-way merge... Auto-merging drivers/video/hdmi.c CONFLICT (content): Merge conflict in drivers/video/hdmi.c error: Failed to merge in the changes. Patch failed at 0006 video/hdmi: Handle the MPEG Source infoframe 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
