== Series Details == Series: nova-core: Memory management infrastructure (v6) URL : https://patchwork.freedesktop.org/series/160380/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/160380/revisions/1/mbox/ not applied Applying: rust: clist: Add support to interface with C linked lists Applying: gpu: Move DRM buddy allocator one level up Using index info to reconstruct a base tree... M Documentation/gpu/drm-mm.rst M drivers/gpu/drm/Kconfig M drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c M drivers/gpu/drm/drm_buddy.c M drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c M drivers/gpu/drm/xe/xe_svm.c M drivers/gpu/drm/xe/xe_ttm_vram_mgr.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_ttm_vram_mgr.c Auto-merging drivers/gpu/drm/xe/xe_svm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_svm.c Auto-merging drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c Auto-merging drivers/gpu/drm/drm_buddy.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_buddy.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c Auto-merging drivers/gpu/drm/Kconfig Auto-merging Documentation/gpu/drm-mm.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 gpu: Move DRM buddy allocator one level up 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
