[Intel-gfx] ✗ Fi.CI.BUILD: failure for DRM_USE_DYNAMIC_DEBUG regression (rev2)

[Patchwork]

== Series Details ==

Series: DRM_USE_DYNAMIC_DEBUG regression (rev2)
URL   : https://patchwork.freedesktop.org/series/111651/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/111651/revisions/2/mbox/ not applied
Applying: test-dyndbg: fixup CLASSMAP usage error
Applying: test-dyndbg: show that DEBUG enables prdbgs at compiletime
Applying: dyndbg: replace classmap list with a vector
Applying: dyndbg: make ddebug_apply_class_bitmap more selective
Applying: dyndbg: split param_set_dyndbg_classes to inner/outer
Applying: dyndbg: drop NUM_TYPE_ARRAY
Applying: dyndbg: reduce verbose/debug clutter
Applying: dyndbg: tighten ddebug_class_name() 1st arg
Applying: dyndbg: constify ddebug_apply_class_bitmap args
Applying: dyndbg-API: split DECLARE_(DYNDBG_CLASSMAP) to $1(_DEFINE|_USE)
Applying: dyndbg-API: specialize DYNDBG_CLASSMAP_(DEFINE|USE)
Using index info to reconstruct a base tree...
M	include/asm-generic/vmlinux.lds.h
M	kernel/module/main.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/module/main.c
Auto-merging include/asm-generic/vmlinux.lds.h
CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0011 dyndbg-API: specialize DYNDBG_CLASSMAP_(DEFINE|USE)
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".