== Series Details == Series: DRM kmap() fixes and kmap_local_page() conversions URL : https://patchwork.freedesktop.org/series/97889/ State : failure == Summary == Applying: drm/i915: Replace kmap() with kmap_local_page() Applying: drm/amd: Replace kmap() with kmap_local_page() Applying: drm/gma: Remove calls to kmap() Using index info to reconstruct a base tree... M drivers/gpu/drm/gma500/gma_display.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/gma500/gma_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/gma_display.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/gma: Remove calls to kmap() 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".
