== Series Details == Series: some cleanups, mostly around fbdev emulation URL : https://patchwork.freedesktop.org/series/55690/ State : failure == Summary == Applying: drm/irq: Don't check for DRIVER_HAVE_IRQ in drm_irq_(un)install Applying: drm: Switch DRIVER_ flags to an enum Applying: drm/irq: Ditch DRIVER_IRQ_SHARED Applying: drm/fb-helper: Add fill_info() functions Applying: drm/fb-helper: set fbi->fix.id in fill_info() Applying: drm/fb_helper: set info->par in fill_info() Applying: drm/amdgpu: Use drm_fb_helper_fill_info Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0007 drm/amdgpu: Use drm_fb_helper_fill_info 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
