== Series Details == Series: drm/vblank: Enforce all-or-nothing vblank support URL : https://patchwork.freedesktop.org/series/172249/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/172249/revisions/1/mbox/ not applied Applying: drm/vblank: Add drm_device.has_hw_vblank Applying: drm/vblank: Remove drm->num_crtcs Applying: drm/vblank: Remove num_crtcs argument from drm_vblank_init() Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c M drivers/gpu/drm/i915/display/intel_display_driver.c M drivers/gpu/drm/virtio/virtgpu_display.c M drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c Auto-merging drivers/gpu/drm/virtio/virtgpu_display.c Auto-merging drivers/gpu/drm/i915/display/intel_display_driver.c Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.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/vblank: Remove num_crtcs argument from drm_vblank_init() 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
