== Series Details == Series: dyndbg: drm.debug adaptation URL : https://patchwork.freedesktop.org/series/108416/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/108416/revisions/1/mbox/ not applied Applying: drm_print: condense enum drm_debug_category Applying: drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers. Applying: drm_print: interpose drm_*dbg with forwarding macros Applying: drm_print: wrap drm_*_dbg in dyndbg descriptor factory macro Using index info to reconstruct a base tree... M drivers/gpu/drm/Kconfig M drivers/gpu/drm/Makefile Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/Makefile Auto-merging drivers/gpu/drm/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/Kconfig error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 drm_print: wrap drm_*_dbg in dyndbg descriptor factory macro 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".
