== Series Details == Series: htmldocs fixes for next-20230203 URL : https://patchwork.freedesktop.org/series/113640/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/113640/revisions/1/mbox/ not applied Applying: drm/i915/doc: Escape wildcard in method names Applying: drm/scheduler: Fix elapsed_ns kernel-doc error Using index info to reconstruct a base tree... M include/drm/gpu_scheduler.h Falling back to patching base and 3-way merge... Auto-merging include/drm/gpu_scheduler.h CONFLICT (content): Merge conflict in include/drm/gpu_scheduler.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/scheduler: Fix elapsed_ns kernel-doc error 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".
