== Series Details == Series: Use drm_clflush* instead of clflush (rev7) URL : https://patchwork.freedesktop.org/series/99450/ State : failure == Summary == Applying: drm: Add arch arm64 for drm_clflush_virt_range Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_cache.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/drm_cache.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_cache.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: Add arch arm64 for drm_clflush_virt_range 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".
