[igt-dev] ✗ Fi.CI.BUILD: failure for gputop memory information (rev2)

[Patchwork]

== Series Details ==

Series: gputop memory information (rev2)
URL   : https://patchwork.freedesktop.org/series/116236/
State : failure

== Summary ==

Applying: lib/igt_drm_fdinfo: Parse memory usage
Applying: gputop: Add memory information
Using index info to reconstruct a base tree...
M	lib/igt_drm_clients.c
M	lib/igt_drm_clients.h
M	tools/gputop.c
Falling back to patching base and 3-way merge...
Auto-merging tools/gputop.c
CONFLICT (content): Merge conflict in tools/gputop.c
Auto-merging lib/igt_drm_clients.h
Auto-merging lib/igt_drm_clients.c
Patch failed at 0002 gputop: Add memory information
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".