[igt-dev] ✗ Fi.CI.BUILD: failure for uAPI Alignment - Cleanup and future proof (rev4)
Patchwork
patchwork at emeril.freedesktop.org
Wed Nov 29 15:16:32 UTC 2023
== Series Details ==
Series: uAPI Alignment - Cleanup and future proof (rev4)
URL : https://patchwork.freedesktop.org/series/126537/
State : failure
== Summary ==
Applying: drm-uapi/xe: Extend drm_xe_vm_bind_op
Applying: xe_ioctl: Converge bo_create to the most used version
Using index info to reconstruct a base tree...
M lib/xe/xe_ioctl.c
M lib/xe/xe_ioctl.h
M tests/intel/xe_vm.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/xe_vm.c
Auto-merging lib/xe/xe_ioctl.h
CONFLICT (content): Merge conflict in lib/xe/xe_ioctl.h
Auto-merging lib/xe/xe_ioctl.c
CONFLICT (content): Merge conflict in lib/xe/xe_ioctl.c
Patch failed at 0002 xe_ioctl: Converge bo_create to the most used version
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