From: Patchwork <patchwork@emeril.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for Another shot at cruft removal
Date: Wed, 30 Mar 2016 16:13:35 -0000 [thread overview]
Message-ID: <20160330161335.6276.20703@emeril.freedesktop.org> (raw)
In-Reply-To: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch>
== Series Details ==
Series: Another shot at cruft removal
URL : https://patchwork.freedesktop.org/series/5033/
State : failure
== Summary ==
Series 5033v1 Another shot at cruft removal
2016-03-30T09:23:14.874392 http://patchwork.freedesktop.org/api/1.0/series/5033/revisions/1/mbox/
Applying: drm/ttm: Remove TTM_HAS_AGP
Using index info to reconstruct a base tree...
M drivers/gpu/drm/ttm/Makefile
M drivers/gpu/drm/ttm/ttm_agp_backend.c
M drivers/gpu/drm/ttm/ttm_page_alloc.c
M drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
M include/drm/ttm/ttm_bo_driver.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/ttm/ttm_bo_driver.h
CONFLICT (content): Merge conflict in include/drm/ttm/ttm_bo_driver.h
Patch failed at 0001 drm/ttm: Remove TTM_HAS_AGP
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2016-03-30 16:13 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 9:45 [PATCH 00/10] Another shot at cruft removal Daniel Vetter
2016-03-30 9:45 ` [PATCH 01/10] drm/ttm: Remove TTM_HAS_AGP Daniel Vetter
2016-03-30 10:48 ` Emil Velikov
2016-03-30 11:00 ` [Intel-gfx] " kbuild test robot
2016-03-30 11:07 ` [PATCH] " Daniel Vetter
2016-03-30 11:19 ` [Intel-gfx] " kbuild test robot
2016-03-30 11:24 ` Daniel Vetter
2016-03-30 12:53 ` Emil Velikov
2016-03-30 15:21 ` Daniel Vetter
2016-03-30 9:45 ` [PATCH 02/10] drm: Use dev->name as fallback for dev->unique Daniel Vetter
2016-03-30 10:43 ` Emil Velikov
2016-04-26 11:12 ` Daniel Vetter
2016-03-30 9:45 ` [PATCH 03/10] drm/sysfs: Annote lockless show functions with READ_ONCE Daniel Vetter
2016-04-26 11:24 ` Daniel Vetter
2016-03-30 9:45 ` [PATCH 04/10] drm/sysfs: Nuke TV/DVI property files Daniel Vetter
2016-03-30 13:49 ` Alex Deucher
2016-03-30 15:30 ` Daniel Vetter
2016-03-30 9:45 ` [PATCH 05/10] drm: Give drm_agp_clear drm_legacy_ prefix Daniel Vetter
2016-03-30 10:09 ` kbuild test robot
2016-03-30 12:59 ` [Intel-gfx] " Thierry Reding
2016-03-30 9:45 ` [PATCH 06/10] drm: Put legacy lastclose work into drm_legacy_dev_reinit Daniel Vetter
2016-03-30 13:01 ` Thierry Reding
2016-03-30 9:45 ` [PATCH 07/10] drm: Move drm_getmap into drm_bufs.c and give it a legacy prefix Daniel Vetter
2016-03-30 9:45 ` [PATCH 08/10] drm: Forbid legacy MAP functions for DRIVER_MODESET Daniel Vetter
2016-03-30 10:39 ` Emil Velikov
2016-04-14 10:06 ` Daniel Vetter
2016-04-14 13:57 ` Emil Velikov
2016-03-30 9:45 ` [PATCH 09/10] drm: Push struct_mutex into ->master_destroy Daniel Vetter
2016-03-30 9:45 ` [PATCH 10/10] drm: Hide master MAP cleanup in drm_bufs.c Daniel Vetter
2016-03-30 16:13 ` 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=20160330161335.6276.20703@emeril.freedesktop.org \
--to=patchwork@emeril.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.