[igt-dev] ✗ Fi.CI.BAT: failure for i915/gem_sparseobject: Add sparse object IGT tests (rev2)

[Patchwork]

== Series Details ==

Series: i915/gem_sparseobject: Add sparse object IGT tests (rev2)
URL   : https://patchwork.freedesktop.org/series/58290/
State : failure

== Summary ==

Applying: i915/gem_sparseobject: Add sparse object IGT tests
Using index info to reconstruct a base tree...
M	include/drm-uapi/i915_drm.h
M	lib/Makefile.sources
M	lib/meson.build
M	tests/Makefile.sources
M	tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
Auto-merging tests/Makefile.sources
Auto-merging lib/meson.build
Auto-merging lib/Makefile.sources
Auto-merging include/drm-uapi/i915_drm.h
CONFLICT (content): Merge conflict in include/drm-uapi/i915_drm.h
Patch failed at 0001 i915/gem_sparseobject: Add sparse object IGT tests
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".