✗ Fi.CI.BUILD: failure for Plane Color Pipeline support for Intel platforms (rev3)
Patchwork
patchwork at emeril.freedesktop.org
Mon Mar 10 11:41:35 UTC 2025
== Series Details ==
Series: Plane Color Pipeline support for Intel platforms (rev3)
URL : https://patchwork.freedesktop.org/series/129811/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/129811/revisions/3/mbox/ not applied
Applying: drm: color pipeline base work
Using index info to reconstruct a base tree...
M Documentation/gpu/rfc/index.rst
M drivers/gpu/drm/Makefile
M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
M drivers/gpu/drm/vkms/Kconfig
M drivers/gpu/drm/vkms/Makefile
M drivers/gpu/drm/vkms/vkms_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/vkms/vkms_drv.h
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/vkms/tests/Makefile
Auto-merging drivers/gpu/drm/vkms/tests/Makefile
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/vkms/tests/.kunitconfig
Auto-merging drivers/gpu/drm/vkms/tests/.kunitconfig
Auto-merging drivers/gpu/drm/vkms/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/vkms/Makefile
Auto-merging drivers/gpu/drm/vkms/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/vkms/Kconfig
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/Makefile
Auto-merging Documentation/gpu/rfc/index.rst
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: color pipeline base work
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