[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/perf: Add support for multi context perf queries (rev3)
Patchwork
patchwork at emeril.freedesktop.org
Wed Apr 29 10:33:56 UTC 2020
== Series Details ==
Series: drm/i915/perf: Add support for multi context perf queries (rev3)
URL : https://patchwork.freedesktop.org/series/76588/
State : failure
== Summary ==
Applying: drm/i915/perf: break OA config buffer object in 2
Applying: drm/i915/perf: stop using the kernel context
Applying: drm/i915/perf: prepare driver to receive multiple ctx handles
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_perf.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_perf.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_perf.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915/perf: prepare driver to receive multiple ctx handles
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 Intel-gfx
mailing list