== Series Details == Series: drm/i915/display: conversion to drm_device based logging macros (rev5) URL : https://patchwork.freedesktop.org/series/72760/ State : failure == Summary == Applying: drm/i915/dsb: convert to drm_device based logging macros. Applying: drm/i915/fbc: convert to drm_device based logging macros. Applying: drm/i915/fbdev: convert to drm_device based logging. Applying: drm/i915/fifo_underrun: convert to drm_device based logging. Applying: drm/i915/gmbus: convert to drm_device based logging, Applying: drm/i915/hdcp: convert to struct drm_device based logging. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_hdcp.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0006 drm/i915/hdcp: convert to struct drm_device based logging. 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
