From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BAT: failure for drm/i915: Fix compilation (panel orientation x enum plane rename).
Date: Mon, 4 Dec 2017 16:42:50 -0800 [thread overview]
Message-ID: <20171205004250.g5rt757yadpkk6se@intel.com> (raw)
In-Reply-To: <20171205001422.17977.15419@emeril.freedesktop.org>
On Tue, Dec 05, 2017 at 12:14:22AM +0000, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915: Fix compilation (panel orientation x enum plane rename).
> URL : https://patchwork.freedesktop.org/series/34876/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915: Fix compilation (panel orientation x enum plane rename).
> error: Failed to merge in the changes.
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/intel_dsi.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_dsi.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dsi.c
> Patch failed at 0001 drm/i915: Fix compilation (panel orientation x enum plane rename).
> The copy of the patch that failed is found in: .git/rebase-apply/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".
>
Ouch! commit '82daca297506 ("drm/i915: Add "panel orientation"
property to the panel connector, v6.")' is merged on drm-misc, not on drm-intel-next-queued.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-12-05 0:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-05 0:04 [PATCH] drm/i915: Fix compilation (panel orientation x enum plane rename) Rodrigo Vivi
2017-12-05 0:09 ` Michel Thierry
2017-12-05 0:58 ` Rodrigo Vivi
2017-12-05 8:18 ` Hans de Goede
2017-12-05 10:12 ` Joonas Lahtinen
2017-12-05 10:14 ` Daniel Vetter
2017-12-05 10:42 ` Hans de Goede
2017-12-05 0:14 ` ✗ Fi.CI.BAT: failure for " Patchwork
2017-12-05 0:42 ` Rodrigo Vivi [this message]
2017-12-05 13:38 ` [PATCH] " Ville Syrjälä
2017-12-05 14:06 ` Joonas Lahtinen
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=20171205004250.g5rt757yadpkk6se@intel.com \
--to=rodrigo.vivi@intel.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 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.