From: Patchwork <patchwork@emeril.freedesktop.org>
To: Hans de Goede <hdegoede@redhat.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for drm/i915: Program LUT before intel_color_commit() if LUT was not previously set
Date: Sun, 20 Oct 2019 18:34:33 -0000 [thread overview]
Message-ID: <20191020183433.5311.26612@emeril.freedesktop.org> (raw)
In-Reply-To: <20191020181933.54829-1-hdegoede@redhat.com>
== Series Details ==
Series: drm/i915: Program LUT before intel_color_commit() if LUT was not previously set
URL : https://patchwork.freedesktop.org/series/68278/
State : failure
== Summary ==
Applying: drm/i915: Program LUT before intel_color_commit() if LUT was not previously set
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_color.c
M drivers/gpu/drm/i915/display/intel_display.c
M drivers/gpu/drm/i915/display/intel_display_types.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
Auto-merging drivers/gpu/drm/i915/display/intel_color.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915: Program LUT before intel_color_commit() if LUT was not previously set
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-10-20 18:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-20 18:19 [PATCH] drm/i915: Program LUT before intel_color_commit() if LUT was not previously set Hans de Goede
2019-10-20 18:34 ` Patchwork [this message]
2019-10-21 7:45 ` Hans de Goede
2019-10-21 14:39 ` Ville Syrjälä
2019-10-25 19:23 ` Hans de Goede
2019-10-25 19:23 ` [Intel-gfx] " Hans de Goede
2019-10-25 19:45 ` Ville Syrjälä
2019-10-25 19:45 ` [Intel-gfx] " Ville Syrjälä
2019-10-28 18:56 ` Hans de Goede
2019-10-28 18:56 ` [Intel-gfx] " Hans de Goede
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=20191020183433.5311.26612@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=hdegoede@redhat.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