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 some cleanups, mostly around fbdev emulation
Date: Thu, 24 Jan 2019 17:01:54 -0000 [thread overview]
Message-ID: <20190124170154.23419.44520@emeril.freedesktop.org> (raw)
In-Reply-To: <20190124165831.16427-1-daniel.vetter@ffwll.ch>
== Series Details ==
Series: some cleanups, mostly around fbdev emulation
URL : https://patchwork.freedesktop.org/series/55690/
State : failure
== Summary ==
Applying: drm/irq: Don't check for DRIVER_HAVE_IRQ in drm_irq_(un)install
Applying: drm: Switch DRIVER_ flags to an enum
Applying: drm/irq: Ditch DRIVER_IRQ_SHARED
Applying: drm/fb-helper: Add fill_info() functions
Applying: drm/fb-helper: set fbi->fix.id in fill_info()
Applying: drm/fb_helper: set info->par in fill_info()
Applying: drm/amdgpu: Use drm_fb_helper_fill_info
Using index info to reconstruct a base tree...
M drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0007 drm/amdgpu: Use drm_fb_helper_fill_info
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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2019-01-24 17:01 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 16:58 [PATCH 00/26] some cleanups, mostly around fbdev emulation Daniel Vetter
2019-01-24 16:58 ` [PATCH 01/26] drm/irq: Don't check for DRIVER_HAVE_IRQ in drm_irq_(un)install Daniel Vetter
[not found] ` <20190124165831.16427-2-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2019-01-25 10:40 ` Sam Ravnborg
2019-01-25 15:09 ` Emil Velikov
2019-01-24 16:58 ` [PATCH 02/26] drm: Switch DRIVER_ flags to an enum Daniel Vetter
2019-01-24 17:38 ` Sam Ravnborg
2019-01-25 9:35 ` Daniel Vetter
2019-01-24 16:58 ` [PATCH 03/26] drm/irq: Ditch DRIVER_IRQ_SHARED Daniel Vetter
2019-01-25 14:46 ` Emil Velikov
2019-01-25 16:14 ` [Intel-gfx] " Daniel Vetter
2019-01-28 11:47 ` Emil Velikov
2019-01-24 16:58 ` [PATCH 04/26] drm/fb-helper: Add fill_info() functions Daniel Vetter
2019-01-24 17:40 ` Noralf Trønnes
2019-01-25 8:48 ` Daniel Vetter
2019-01-25 9:46 ` Noralf Trønnes
2019-01-25 10:15 ` Daniel Vetter
2019-01-24 16:58 ` [PATCH 05/26] drm/fb-helper: set fbi->fix.id in fill_info() Daniel Vetter
2019-01-24 17:28 ` Daniel Vetter
2019-01-24 16:58 ` [PATCH 06/26] drm/fb_helper: set info->par " Daniel Vetter
2019-01-24 17:45 ` Sam Ravnborg
2019-01-25 8:44 ` Daniel Vetter
2019-01-25 18:25 ` Sam Ravnborg
2019-01-24 16:58 ` [PATCH 07/26] drm/amdgpu: Use drm_fb_helper_fill_info Daniel Vetter
2019-01-24 16:58 ` [PATCH 08/26] drm/armada: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 09/26] drm/ast: " Daniel Vetter
2019-01-24 18:00 ` Sam Ravnborg
2019-01-25 8:51 ` Daniel Vetter
2019-01-24 16:58 ` [PATCH 10/26] drm/cirrus: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 11/26] drm/exynos: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 12/26] drm/gma500: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 13/26] drm/hibmc: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 14/26] drm/i915: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 15/26] drm/mga200g: " Daniel Vetter
[not found] ` <20190124165831.16427-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2019-01-24 16:58 ` [PATCH 16/26] drm/bochs: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 26/26] drm/<drivers>: Don't set FBINFO_(FLAG_)DEFAULT Daniel Vetter
2019-01-25 15:02 ` Emil Velikov
2019-01-29 9:58 ` [Intel-gfx] " Daniel Vetter
2019-01-25 15:14 ` Thierry Reding
2019-01-24 16:58 ` [PATCH 17/26] drm/nouveau: Use drm_fb_helper_fill_info Daniel Vetter
2019-01-24 16:58 ` [PATCH 18/26] drm/omap: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 19/26] drm/qxl: " Daniel Vetter
2019-01-25 6:39 ` Gerd Hoffmann
2019-01-25 8:52 ` Daniel Vetter
2019-01-24 16:58 ` [PATCH 20/26] drm/radeon: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 21/26] drm/rockchip: " Daniel Vetter
2019-01-27 19:18 ` Heiko Stuebner
2019-01-24 16:58 ` [PATCH 22/26] drm/qxl: " Daniel Vetter
2019-01-25 15:14 ` Thierry Reding
2019-01-24 16:58 ` [PATCH 23/26] drm/udl: " Daniel Vetter
2019-01-24 16:58 ` [PATCH 24/26] staging/vboxvideo: " Daniel Vetter
2019-01-25 8:51 ` Greg Kroah-Hartman
2019-01-24 16:58 ` [PATCH 25/26] drm/fb-helper: Unexport fill_{var,info} Daniel Vetter
2019-01-24 17:01 ` 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=20190124170154.23419.44520@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox