== Summary == Series 2822v2 Series without cover letter Apply patch: http://patchwork.freedesktop.org/api/1.0/series/2822/revisions/2/mbox/ Applying: drm/vblank: Use drm_event_reserve_init Applying: drm: Clean up pending events in the core Applying: drm: Nuke vblank event file cleanup code Applying: drm/i915: Nuke intel_modeset_preclose Applying: drm/atmel: Nuke preclose Applying: drm/exynos: Remove event cancelling from postclose Applying: drm/imx: Unconfuse preclose logic Applying: drm/msm: Nuke preclose hooks Applying: drm/omap: Nuke close hooks Applying: drm/rcar: Nuke preclose hook Applying: drm/shmob: Nuke preclose hook Applying: drm/tegra: Stop cancelling page flip events Applying: drm/tilcdc: Nuke preclose hook Applying: drm/vc4: Nuke preclose hook Applying: drm/vmwgfx: Nuke preclose hook Using index info to reconstruct a base tree... M drivers/gpu/drm/vmwgfx/vmwgfx_drv.c M drivers/gpu/drm/vmwgfx/vmwgfx_fence.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_fence.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_fence.c Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c Failed to merge in the changes. Patch failed at 0015 drm/vmwgfx: Nuke preclose hook The copy of the patch that failed is found in: /home/builder/igt/drm-intel/.git/rebase-apply/patch 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". Unstaged changes after reset: M drivers/gpu/drm/vmwgfx/vmwgfx_drv.c M drivers/gpu/drm/vmwgfx/vmwgfx_drv.h M drivers/gpu/drm/vmwgfx/vmwgfx_fence.h Series 2822 revision 2 failed at git-am _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
