✗ Fi.CI.BUILD: failure for series starting with [v 7,1/2] gpu/buddy: replace dual-tree/force_merge with deco upled dirty tracker

Patchwork <[email protected]> Fri, 31 Jul 2026 07:28:59 -0000
Newsgroups org.freedesktop.lists.intel-gfx
Message-ID <178548293902.8209.1322413796335465696@61270ab9df2a>
== Series Details ==

Series: series starting with [v7,1/2] gpu/buddy: replace dual-tree/force_merge with decoupled dirty tracker
URL   : https://patchwork.freedesktop.org/series/171418/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/171418/revisions/1/mbox/ not applied
Applying: gpu/buddy: replace dual-tree/force_merge with decoupled dirty tracker
Using index info to reconstruct a base tree...
M	drivers/gpu/buddy.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/buddy.c
CONFLICT (content): Merge conflict in drivers/gpu/buddy.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 gpu/buddy: replace dual-tree/force_merge with decoupled dirty tracker
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".
Build failed, no error log produced