== Series Details == Series: DYNDBG: opt-in class'd debug for modules, use in drm. (rev2) URL : https://patchwork.freedesktop.org/series/106427/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/106427/revisions/2/mbox/ not applied Applying: dyndbg: fix static_branch manipulation Applying: dyndbg: fix module.dyndbg handling Applying: dyndbg: show both old and new in change-info Applying: dyndbg: reverse module walk in cat control Applying: dyndbg: reverse module.callsite walk in cat control Applying: dyndbg: use ESCAPE_SPACE for cat control Applying: dyndbg: let query-modname override actual module name Applying: dyndbg: add test_dynamic_debug module Applying: dyndbg: drop EXPORTed dynamic_debug_exec_queries Applying: dyndbg: add class_id to pr_debug callsites Applying: dyndbg: add __pr_debug_cls for testing Applying: dyndbg: add DECLARE_DYNDBG_CLASSMAP Applying: kernel/module: add __dyndbg_classes section Applying: dyndbg: add ddebug_attach_module_classes Applying: dyndbg: validate class FOO by checking with module Applying: dyndbg: add drm.debug style bitmap support Applying: dyndbg: test DECLARE_DYNDBG_CLASSMAP, sysfs nodes Applying: doc-dyndbg: describe "class CLASS_NAME" query support Applying: doc-dyndbg: edit dynamic-debug-howto for brevity, audience 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 0023 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".
