[igt-dev] ✗ Fi.CI.BUILD: failure for PMU: multi-tile support (rev3)

Patchwork patchwork at emeril.freedesktop.org
Wed May 17 21:05:29 UTC 2023


== Series Details ==

Series: PMU: multi-tile support (rev3)
URL   : https://patchwork.freedesktop.org/series/117406/
State : failure

== Summary ==

Applying: perf_pmu: Support multi-tile in rc6 subtest
Applying: perf_pmu: Two new rc6 subtests
Applying: perf_pmu: Support multi-tile in frequency subtest
Applying: perf_pmu: Quiesce GPU if measuring idle busyness without spinner
Applying: perf_pmu: Use correct pmu config for multi-tile
Applying: intel_gpu_top: Add an array of freq and rc6 counters
Using index info to reconstruct a base tree...
M	tools/intel_gpu_top.c
Falling back to patching base and 3-way merge...
Auto-merging tools/intel_gpu_top.c
CONFLICT (content): Merge conflict in tools/intel_gpu_top.c
Patch failed at 0006 intel_gpu_top: Add an array of freq and rc6 counters
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".




More information about the igt-dev mailing list