== Series Details == Series: drm: Clean up VBLANK callbacks in struct drm_driver (rev9) URL : https://patchwork.freedesktop.org/series/71873/ State : failure == Summary == Applying: drm: Remove internal setup of struct drm_device.vblank_disable_immediate Applying: drm: Add get_scanout_position() to struct drm_crtc_helper_funcs Applying: drm: Add get_vblank_timestamp() to struct drm_crtc_funcs Applying: drm/amdgpu: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Applying: drm/amdgpu: Convert to CRTC VBLANK callbacks Applying: drm/gma500: Convert to CRTC VBLANK callbacks Applying: drm/i915: Convert to CRTC VBLANK callbacks Applying: drm/nouveau: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Applying: drm/nouveau: Convert to CRTC VBLANK callbacks Applying: drm/radeon: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Applying: drm/radeon: Convert to CRTC VBLANK callbacks Applying: drm/msm: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Applying: drm/msm: Convert to CRTC VBLANK callbacks Applying: drm/stm: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Applying: drm/stm: Convert to CRTC VBLANK callbacks Applying: drm/sti: Convert to CRTC VBLANK callbacks Applying: drm/vc4: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Applying: drm/vc4: Convert to CRTC VBLANK callbacks Applying: drm/vkms: Convert to CRTC VBLANK callbacks Applying: drm/vmwgfx: Convert to CRTC VBLANK callbacks Using index info to reconstruct a base tree... M drivers/gpu/drm/vmwgfx/vmwgfx_drv.c M drivers/gpu/drm/vmwgfx/vmwgfx_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0020 drm/vmwgfx: Convert to CRTC VBLANK callbacks 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
