From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Noralf Trønnes" <noralf@tronnes.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm/fb-helper: Move modesetting code to drm_client (rev7)
Date: Thu, 23 May 2019 16:24:44 -0000 [thread overview]
Message-ID: <20190523162444.12612.31329@emeril.freedesktop.org> (raw)
In-Reply-To: <20190523134413.4210-1-noralf@tronnes.org>
== Series Details ==
Series: drm/fb-helper: Move modesetting code to drm_client (rev7)
URL : https://patchwork.freedesktop.org/series/58597/
State : failure
== Summary ==
Applying: drm/atomic: Move __drm_atomic_helper_disable_plane/set_config()
Applying: drm/fb-helper: Remove drm_fb_helper_crtc
Using index info to reconstruct a base tree...
M drivers/gpu/drm/Makefile
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 drm/fb-helper: Remove drm_fb_helper_crtc
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
next prev parent reply other threads:[~2019-05-23 16:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 13:44 [PATCH v6 0/8] drm/fb-helper: Move modesetting code to drm_client Noralf Trønnes
2019-05-23 13:44 ` [PATCH v6 1/8] drm/atomic: Move __drm_atomic_helper_disable_plane/set_config() Noralf Trønnes
2019-05-23 13:44 ` [PATCH v6 2/8] drm/fb-helper: Remove drm_fb_helper_crtc Noralf Trønnes
2019-05-23 18:58 ` Noralf Trønnes
2019-05-23 13:44 ` [PATCH v6 3/8] drm/fb-helper: Prepare to move out commit code Noralf Trønnes
2019-05-23 13:44 ` [PATCH v6 4/8] drm/fb-helper: Move " Noralf Trønnes
2019-05-23 13:44 ` [PATCH v6 5/8] drm/fb-helper: Remove drm_fb_helper_connector Noralf Trønnes
2019-05-23 13:44 ` [PATCH v6 6/8] drm/fb-helper: Prepare to move out modeset config code Noralf Trønnes
2019-05-23 13:44 ` [PATCH v6 7/8] drm/fb-helper: Move " Noralf Trønnes
2019-05-23 13:44 ` [PATCH v6 8/8] drm/client: Hack: Add bootsplash example Noralf Trønnes
2019-05-23 16:24 ` Patchwork [this message]
2019-05-23 16:53 ` [PATCH v6 0/8] drm/fb-helper: Move modesetting code to drm_client Sam Ravnborg
2019-05-24 12:10 ` Gerd Hoffmann
2019-05-24 15:18 ` Linus Walleij
2019-05-24 15:26 ` Sam Ravnborg
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=20190523162444.12612.31329@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=noralf@tronnes.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).