✗ Fi.CI.BUILD: failure for drm/i915/ttm: remove shmem memory region and gem object backend (rev13)

Patchwork patchwork at emeril.freedesktop.org
Tue Jun 7 17:49:20 UTC 2022


== Series Details ==

Series: drm/i915/ttm: remove shmem memory region and gem object backend (rev13)
URL   : https://patchwork.freedesktop.org/series/100763/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/100763/revisions/13/mbox/ not applied
Applying: drm/i915/ttm: remove shmem memory region and gem object backend
.git/rebase-apply/patch:840: trailing whitespace.
        
.git/rebase-apply/patch:841: trailing whitespace.
        
.git/rebase-apply/patch:849: trailing whitespace.
                                
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_shmem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_shmem.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 drm/i915/ttm: remove shmem memory region and gem object backend
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".




More information about the Intel-gfx-trybot mailing list