✗ Fi.CI.BUILD: failure for drm/ci: uprev mesa and generate testlist

Patchwork patchwork at emeril.freedesktop.org
Tue Apr 30 09:32:58 UTC 2024


== Series Details ==

Series: drm/ci: uprev mesa and generate testlist
URL   : https://patchwork.freedesktop.org/series/133058/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/133058/revisions/1/mbox/ not applied
Applying: drm/ci: uprev mesa version
Applying: drm/ci: generate testlist from build
Applying: drm/ci: build virtual GPU driver as module
Applying: drm/ci: skip driver specific tests
Applying: drm/ci: update xfails for the new testlist
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
Falling back to patching base and 3-way merge...
Removing drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt
Removing drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
Auto-merging drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
CONFLICT (content): Merge conflict in drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 drm/ci: update xfails for the new testlist
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