From: Patchwork <patchwork@emeril.freedesktop.org>
To: John Stultz <john.stultz@linaro.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm: Add generic fbdev emulation (rev2)
Date: Thu, 23 Aug 2018 06:25:49 -0000 [thread overview]
Message-ID: <20180823062549.8839.96841@emeril.freedesktop.org> (raw)
In-Reply-To: <20180703160354.59955-1-noralf@tronnes.org>
== Series Details ==
Series: drm: Add generic fbdev emulation (rev2)
URL : https://patchwork.freedesktop.org/series/45848/
State : failure
== Summary ==
Applying: drm: Begin an API for in-kernel clients
Using index info to reconstruct a base tree...
M Documentation/gpu/index.rst
M drivers/gpu/drm/Makefile
M drivers/gpu/drm/drm_drv.c
M drivers/gpu/drm/drm_file.c
M drivers/gpu/drm/drm_probe_helper.c
M include/drm/drm_device.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_client.h
CONFLICT (add/add): Merge conflict in include/drm/drm_client.h
Auto-merging drivers/gpu/drm/drm_client.c
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/drm_client.c
error: Failed to merge in the changes.
Patch failed at 0001 drm: Begin an API for in-kernel clients
Use 'git am --show-current-patch' to see the failed 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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2018-08-23 6:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-03 16:03 [PATCH v5 0/8] drm: Add generic fbdev emulation Noralf Trønnes
2018-07-03 16:03 ` [PATCH v5 1/8] drm: Begin an API for in-kernel clients Noralf Trønnes
2018-07-03 16:03 ` [PATCH v5 2/8] drm/fb-helper: Add generic fbdev emulation .fb_probe function Noralf Trønnes
2018-07-03 16:03 ` [PATCH v5 3/8] drm/pl111: Set .gem_prime_vmap and .gem_prime_mmap Noralf Trønnes
2018-07-03 16:03 ` [PATCH v5 4/8] drm/cma-helper: Use the generic fbdev emulation Noralf Trønnes
2018-08-21 6:44 ` John Stultz
2018-08-21 8:44 ` Daniel Vetter
2018-08-21 14:59 ` Noralf Trønnes
2018-08-21 15:41 ` Daniel Vetter
2018-08-21 16:03 ` Noralf Trønnes
2018-08-21 16:46 ` Daniel Vetter
2018-08-21 18:43 ` John Stultz
2018-08-22 7:56 ` Daniel Vetter
2018-08-21 14:15 ` Noralf Trønnes
2018-08-23 4:14 ` John Stultz
2018-08-23 5:51 ` Daniel Vetter
2018-08-23 6:21 ` John Stultz
2018-08-23 7:37 ` Daniel Vetter
2018-08-23 16:49 ` Noralf Trønnes
2018-08-23 17:15 ` Daniel Vetter
2018-08-23 7:46 ` Laurent Pinchart
2018-08-23 8:09 ` Daniel Vetter
2018-08-23 17:48 ` John Stultz
2018-08-23 20:49 ` Laurent Pinchart
2018-08-23 21:12 ` John Stultz
2018-08-24 8:57 ` Laurent Pinchart
2018-08-23 17:38 ` John Stultz
2018-08-23 17:24 ` Ville Syrjälä
2018-08-23 17:42 ` John Stultz
2018-07-03 16:03 ` [PATCH v5 5/8] drm/debugfs: Add internal client debugfs file Noralf Trønnes
2018-07-03 16:03 ` [PATCH v5 6/8] drm/fb-helper: Finish the generic fbdev emulation Noralf Trønnes
2018-07-03 16:03 ` [PATCH v5 7/8] drm/tinydrm: Use drm_fbdev_generic_setup() Noralf Trønnes
2018-07-03 16:03 ` [PATCH v5 8/8] drm/cma-helper: Remove drm_fb_cma_fbdev_init_with_funcs() Noralf Trønnes
2018-07-03 16:15 ` ✗ Fi.CI.CHECKPATCH: warning for drm: Add generic fbdev emulation Patchwork
2018-07-03 16:18 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-07-03 16:32 ` ✓ Fi.CI.BAT: success " Patchwork
2018-07-04 2:38 ` ✓ Fi.CI.IGT: " Patchwork
2018-07-04 8:19 ` [PATCH v5 0/8] " Daniel Vetter
2018-07-10 13:10 ` Noralf Trønnes
2018-08-23 6:25 ` 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=20180823062549.8839.96841@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=john.stultz@linaro.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;
as well as URLs for NNTP newsgroup(s).