From: Patchwork <patchwork@emeril.freedesktop.org>
To: Kevin Strasser <kevin.strasser@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for Support 64 bpp half float formats
Date: Thu, 29 Nov 2018 06:49:44 -0000 [thread overview]
Message-ID: <20181129064944.30068.90030@emeril.freedesktop.org> (raw)
In-Reply-To: <1543473493-30973-1-git-send-email-kevin.strasser@intel.com>
== Series Details ==
Series: Support 64 bpp half float formats
URL : https://patchwork.freedesktop.org/series/53212/
State : failure
== Summary ==
Applying: drm/fourcc: Add 64 bpp half float formats
Applying: drm: Add optional PIXEL_NORMALIZE_RANGE property to drm_plane
Applying: drm/i915: Implement half float formats and pixel normalize property
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_display.c
M drivers/gpu/drm/i915/intel_drv.h
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
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_display.c
error: Failed to merge in the changes.
Patch failed at 0003 drm/i915: Implement half float formats and pixel normalize property
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
next prev parent reply other threads:[~2018-11-29 6:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-29 6:38 [PATCH 0/3] Support 64 bpp half float formats Kevin Strasser
2018-11-29 6:38 ` [PATCH 1/3] drm/fourcc: Add " Kevin Strasser
2018-11-29 18:42 ` Ville Syrjälä
2018-11-29 21:38 ` Strasser, Kevin
2018-11-29 6:38 ` [PATCH 2/3] drm: Add optional PIXEL_NORMALIZE_RANGE property to drm_plane Kevin Strasser
2018-11-29 18:45 ` Ville Syrjälä
2018-11-29 21:38 ` Strasser, Kevin
2018-11-29 6:38 ` [PATCH 3/3] drm/i915: Implement half float formats and pixel normalize property Kevin Strasser
2018-11-29 9:18 ` Daniel Vetter
2018-11-29 17:52 ` Strasser, Kevin
2018-11-30 9:42 ` Daniel Vetter
2018-11-29 18:52 ` Ville Syrjälä
2018-11-29 21:39 ` Strasser, Kevin
2018-11-29 6:49 ` Patchwork [this message]
2018-11-29 19:26 ` [Intel-gfx] [PATCH 0/3] Support 64 bpp half float formats Ville Syrjälä
2018-11-29 21:39 ` Strasser, Kevin
2018-11-30 14:15 ` Ville Syrjälä
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=20181129064944.30068.90030@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kevin.strasser@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.