[igt-dev] ✗ Fi.CI.BUILD: failure for Vendor agnostic gputop (rev6)

[Tvrtko Ursulin]

On 06/04/2023 15:44, Patchwork wrote:
> == Series Details ==
> 
> Series: Vendor agnostic gputop (rev6)
> URL   : https://patchwork.freedesktop.org/series/102175/
> State : failure
> 
> == Summary ==
> 
> Applying: lib: Extract igt_drm_clients from intel_gpu_top
> Applying: lib: Allow specifying custom engine map
> Using index info to reconstruct a base tree...
> M	lib/igt_drm_fdinfo.c
> M	tests/i915/drm_fdinfo.c
> Falling back to patching base and 3-way merge...
> Auto-merging tests/i915/drm_fdinfo.c
> Auto-merging lib/igt_drm_fdinfo.c
> CONFLICT (content): Merge conflict in lib/igt_drm_fdinfo.c
> Patch failed at 0002 lib: Allow specifying custom engine map
> 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".
> 

commit 31871b929eb219e8be516b5e90337c4143507c26
Author:     Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
AuthorDate: Wed Apr 5 00:09:08 2023 +0000
Commit:     Kamil Konieczny <kamil.konieczny at linux.intel.com>
CommitDate: Thu Apr 6 14:34:44 2023 +0200

     lib/drm_fdinfo: Check for compute engines when parsing

Criss-cross.. another rebase.. But I'll wait until there are some reviews.

Regards,

Tvrtko