== Series Details == Series: Change the meaning of the fields in the ttm_place structure from pfn to bytes URL : https://patchwork.freedesktop.org/series/114603/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/114603/revisions/1/mbox/ not applied Applying: Change the meaning of the fields in the ttm_place structure from pfn to bytes Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/amdgpu/amdgpu_object.c M drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c M drivers/gpu/drm/i915/i915_ttm_buddy_manager.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_ttm_buddy_manager.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_ttm_buddy_manager.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_object.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Change the meaning of the fields in the ttm_place structure from pfn to bytes 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".
