== Series Details == Series: drm: Provide client setup helper and convert drivers (rev5) URL : https://patchwork.freedesktop.org/series/137389/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/137389/revisions/5/mbox/ not applied Applying: drm/fbdev-helper: Move color-mode lookup into 4CC format helper Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_fb_helper.c M drivers/gpu/drm/drm_fourcc.c M include/drm/drm_fourcc.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/drm_fb_helper.c No changes -- Patch already applied. Applying: drm/fbdev-helper: Set and clear VGA switcheroo client from fb_info Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_fb_helper.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/drm_fb_helper.c No changes -- Patch already applied. Applying: drm/fbdev: Add memory-agnostic fbdev client Using index info to reconstruct a base tree... M drivers/gpu/drm/Makefile M drivers/gpu/drm/drm_fb_helper.c M include/drm/drm_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/Makefile No changes -- Patch already applied. Applying: drm: Add client-agnostic setup helper Using index info to reconstruct a base tree... M drivers/gpu/drm/Kconfig M drivers/gpu/drm/Makefile Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/Makefile Auto-merging drivers/gpu/drm/Kconfig No changes -- Patch already applied. Applying: drm/fbdev-dma: Support struct drm_driver.fbdev_probe Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_fbdev_dma.c M include/drm/drm_fbdev_dma.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_fbdev_dma.h CONFLICT (content): Merge conflict in include/drm/drm_fbdev_dma.h Auto-merging drivers/gpu/drm/drm_fbdev_dma.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fbdev_dma.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0005 drm/fbdev-dma: Support struct drm_driver.fbdev_probe 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
