[Intel-gfx] ✗ Fi.CI.BUILD: failure for Update AUX invalidation sequence (rev5)
Patchwork
patchwork at emeril.freedesktop.org
Tue Jul 18 15:51:32 UTC 2023
== Series Details ==
Series: Update AUX invalidation sequence (rev5)
URL : https://patchwork.freedesktop.org/series/119798/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/119798/revisions/5/mbox/ not applied
Applying: drm-tip: 2023y-07m-17d-16h-04m-53s UTC integration manifest
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in integration-manifest
Auto-merging integration-manifest
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm-tip: 2023y-07m-17d-16h-04m-53s UTC integration manifest
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".
Build failed, no error log produced
More information about the Intel-gfx
mailing list