public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@annarchy.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for series starting with drm/vblank: Use drm_event_reserve_init (rev2)
Date: Fri, 29 Jan 2016 10:06:03 -0000	[thread overview]
Message-ID: <20160129100603.21970.31484@annarchy.freedesktop.org> (raw)
In-Reply-To: <1453756616-28942-1-git-send-email-daniel.vetter@ffwll.ch>

== 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@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

      parent reply	other threads:[~2016-01-29 10:06 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-25 21:16 [PATCH 01/15] drm/vblank: Use drm_event_reserve_init Daniel Vetter
2016-01-25 21:16 ` [PATCH 02/15] drm: Clean up pending events in the core Daniel Vetter
2016-01-25 21:16 ` [PATCH 03/15] drm: Nuke vblank event file cleanup code Daniel Vetter
2016-01-25 21:16 ` [PATCH 04/15] drm/i915: Nuke intel_modeset_preclose Daniel Vetter
2016-01-25 21:16 ` [PATCH 05/15] drm/atmel: Nuke preclose Daniel Vetter
2016-01-25 21:16 ` [PATCH 06/15] drm/exynos: Remove event cancelling from postclose Daniel Vetter
2016-01-25 21:16 ` [PATCH 07/15] drm/imx: Unconfuse preclose logic Daniel Vetter
2016-01-25 21:16 ` [PATCH 08/15] drm/msm: Nuke preclose hooks Daniel Vetter
2016-01-25 21:16 ` [PATCH 09/15] drm/omap: Nuke close hooks Daniel Vetter
2016-01-25 21:16 ` [PATCH 10/15] drm/rcar: Nuke preclose hook Daniel Vetter
2016-01-25 21:16 ` [PATCH 11/15] drm/shmob: " Daniel Vetter
2016-01-25 21:16 ` [PATCH 12/15] drm/tegra: Stop cancelling page flip events Daniel Vetter
2016-01-25 21:16 ` [PATCH 13/15] drm/tilcdc: Nuke preclose hook Daniel Vetter
2016-01-25 21:16 ` [PATCH 14/15] drm/vc4: " Daniel Vetter
2016-01-25 21:16 ` [PATCH 15/15] drm/vmwgfx: " Daniel Vetter
2016-01-25 21:19 ` [PATCH 01/15] drm/vblank: Use drm_event_reserve_init Daniel Vetter
2016-01-27 16:36 ` ✓ Fi.CI.BAT: success for series starting with [01/15] " Patchwork
2016-01-28 11:01 ` [PATCH] " Daniel Vetter
2016-01-29 10:06 ` Patchwork [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160129100603.21970.31484@annarchy.freedesktop.org \
    --to=patchwork@annarchy.freedesktop.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox