From: Patchwork <patchwork@emeril.freedesktop.org>
To: Swati Sharma <swati2.sharma@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for Enable Y210, Y212, Y216 formats for ICL (rev3)
Date: Mon, 22 Oct 2018 15:23:30 -0000 [thread overview]
Message-ID: <20181022152330.28548.43125@emeril.freedesktop.org> (raw)
In-Reply-To: <1540186308-4390-1-git-send-email-swati2.sharma@intel.com>
== Series Details ==
Series: Enable Y210, Y212, Y216 formats for ICL (rev3)
URL : https://patchwork.freedesktop.org/series/48729/
State : failure
== Summary ==
Applying: drm: Add Y210, Y212, Y216 format definitions and fourcc
Applying: drm/i915/icl: Add Y210, Y212, Y216 plane control definitions
Applying: drm/i915/icl: Preparations for enabling Y210, Y212, Y216 formats
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_display.c
M drivers/gpu/drm/i915/intel_sprite.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_sprite.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
error: Failed to merge in the changes.
Patch failed at 0003 drm/i915/icl: Preparations for enabling Y210, Y212, Y216 formats
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-10-22 15:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-22 5:31 [PATCH v3 0/4] Enable Y210, Y212, Y216 formats for ICL Swati Sharma
2018-10-22 5:31 ` [PATCH v3 1/4] drm: Add Y210, Y212, Y216 format definitions and fourcc Swati Sharma
2018-10-22 5:31 ` [PATCH v3 2/4] drm/i915/icl: Add Y210, Y212, Y216 plane control definitions Swati Sharma
2018-11-27 20:54 ` Juha-Pekka Heikkilä
2018-10-22 5:31 ` [PATCH v3 3/4] drm/i915/icl: Preparations for enabling Y210, Y212, Y216 formats Swati Sharma
2018-10-22 5:31 ` [PATCH v3 4/4] drm/i915/icl: Enable Y210, Y212, Y216 format for primary and sprite planes Swati Sharma
2018-11-27 21:10 ` Juha-Pekka Heikkilä
2018-10-22 15:23 ` 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=20181022152330.28548.43125@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=swati2.sharma@intel.com \
/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.