From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Alex Deucher" <alexdeucher@gmail.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm: Try to fix encoder possible_clones/crtc (rev4)
Date: Thu, 03 Dec 2020 22:16:34 -0000 [thread overview]
Message-ID: <160703379403.31153.2140266127944374259@emeril.freedesktop.org> (raw)
In-Reply-To: <20200211162208.16224-1-ville.syrjala@linux.intel.com>
== Series Details ==
Series: drm: Try to fix encoder possible_clones/crtc (rev4)
URL : https://patchwork.freedesktop.org/series/63399/
State : failure
== Summary ==
Applying: drm: Include the encoder itself in possible_clones
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_crtc_internal.h
M drivers/gpu/drm/drm_drv.c
M drivers/gpu/drm/drm_mode_config.c
M include/drm/drm_encoder.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_encoder.h
CONFLICT (content): Merge conflict in include/drm/drm_encoder.h
Auto-merging drivers/gpu/drm/drm_mode_config.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_mode_config.c
Auto-merging drivers/gpu/drm/drm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_drv.c
Auto-merging drivers/gpu/drm/drm_crtc_internal.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm: Include the encoder itself in possible_clones
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:[~2020-12-03 22:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 16:22 [Intel-gfx] [PATCH v3 0/7] drm: Try to fix encoder possible_clones/crtc Ville Syrjala
2020-02-11 16:22 ` [Intel-gfx] [PATCH v3 1/7] drm: Include the encoder itself in possible_clones Ville Syrjala
2020-02-11 16:58 ` Daniel Vetter
2020-02-11 16:22 ` [Intel-gfx] [PATCH v3 2/7] drm/gma500: Sanitize possible_clones Ville Syrjala
2020-02-11 16:22 ` [Intel-gfx] [PATCH v3 3/7] drm/exynos: Use drm_encoder_mask() Ville Syrjala
2020-02-17 2:27 ` Inki Dae
2020-02-11 16:22 ` [Intel-gfx] [PATCH v3 4/7] drm/imx: Remove the bogus possible_clones setup Ville Syrjala
2020-02-11 16:22 ` [Intel-gfx] [PATCH v3 5/7] drm: Validate encoder->possible_clones Ville Syrjala
2020-02-11 17:02 ` Daniel Vetter
2020-02-11 17:13 ` Ville Syrjälä
2020-02-12 8:56 ` Daniel Vetter
2020-02-11 16:22 ` [Intel-gfx] [PATCH v3 6/7] drm: Validate encoder->possible_crtcs Ville Syrjala
2020-02-11 17:04 ` Daniel Vetter
2020-09-06 11:19 ` Jan Kiszka
2020-09-07 7:14 ` Daniel Vetter
2020-09-10 18:18 ` Deucher, Alexander
2020-09-29 9:36 ` Jan Kiszka
2020-09-29 20:04 ` Alex Deucher
2020-12-03 21:30 ` Alex Deucher
2020-12-09 13:17 ` Daniel Vetter
2020-12-14 20:26 ` Jan Kiszka
2020-02-11 16:22 ` [Intel-gfx] [PATCH v3 7/7] drm: Allow drivers to leave encoder->possible_crtcs==0 Ville Syrjala
2020-02-11 17:05 ` Daniel Vetter
2020-02-11 17:14 ` Ville Syrjälä
2020-02-12 9:07 ` Daniel Vetter
2020-02-12 9:08 ` Daniel Vetter
2020-03-18 16:44 ` Ville Syrjälä
2020-12-03 22:16 ` 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=160703379403.31153.2140266127944374259@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=alexdeucher@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).