[igt-dev] ✗ Fi.CI.BUILD: failure for tests/perf: add new tests for multi context filtering
Patchwork
patchwork at emeril.freedesktop.org
Fri Mar 27 12:06:45 UTC 2020
== Series Details ==
Series: tests/perf: add new tests for multi context filtering
URL : https://patchwork.freedesktop.org/series/75165/
State : failure
== Summary ==
Applying: include: bump i915 header for new feature
Using index info to reconstruct a base tree...
M include/drm-uapi/i915_drm.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm-uapi/i915_drm.h
CONFLICT (content): Merge conflict in include/drm-uapi/i915_drm.h
Patch failed at 0001 include: bump i915 header for new feature
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