On Thu, 16 Jan 2020, Patchwork <patchwork@xxxxxxxxxxxxxxxxxxxxxx> wrote: > == Series Details == > > Series: drm/i915: conversion to new drm logging macros. > URL : https://patchwork.freedesktop.org/series/72096/ > State : failure > > == Summary == > > Applying: drm/i915/atomic: use new logging macros for debug > Applying: drm/i915/audio: convert to new drm logging macros. > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/display/intel_audio.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/display/intel_audio.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_audio.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0002 drm/i915/audio: convert to new drm logging macros. > 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". When you see this, please rebase and repost. We don't apply patches unless they've passed our CI. Thanks, Jani. > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
