[igt-dev] ✗ Fi.CI.BUILD: failure for uAPI Alignment - take 2

[Patchwork]

== Series Details ==

Series: uAPI Alignment - take 2
URL   : https://patchwork.freedesktop.org/series/124979/
State : failure

== Summary ==

Applying: drm-uapi/xe: Add documentation for query
Using index info to reconstruct a base tree...
M	include/drm-uapi/xe_drm.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm-uapi/xe_drm.h
CONFLICT (content): Merge conflict in include/drm-uapi/xe_drm.h
Patch failed at 0001 drm-uapi/xe: Add documentation for query
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".