All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Werner Sembach" <wse@tuxedocomputers.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Add "activ bpc" and "active color format" drm property
Date: Tue, 08 Jun 2021 19:01:20 -0000	[thread overview]
Message-ID: <162317888046.419.7614489114397128496@emeril.freedesktop.org> (raw)
In-Reply-To: <20210608174320.37429-1-wse@tuxedocomputers.com>

== Series Details ==

Series: Add "activ bpc" and "active color format" drm property
URL   : https://patchwork.freedesktop.org/series/91188/
State : failure

== Summary ==

Applying: drm/amd/display: Add missing cases convert_dc_color_depth_into_bpc
Applying: drm/uAPI: Add "active bpc" as feedback channel for "max bpc" drm property
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_atomic_uapi.c
M	drivers/gpu/drm/drm_connector.c
M	include/drm/drm_connector.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_connector.h
Auto-merging drivers/gpu/drm/drm_connector.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Auto-merging drivers/gpu/drm/drm_atomic_uapi.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/uAPI: Add "active bpc" as feedback channel for "max bpc" drm property
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

      parent reply	other threads:[~2021-06-08 19:01 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-08 17:43 [PATCH 0/7] Add "activ bpc" and "active color format" drm property Werner Sembach
2021-06-08 17:43 ` Werner Sembach
2021-06-08 17:43 ` [Intel-gfx] " Werner Sembach
2021-06-08 17:43 ` [PATCH v2 1/7] drm/amd/display: Add missing cases convert_dc_color_depth_into_bpc Werner Sembach
2021-06-08 17:43   ` Werner Sembach
2021-06-08 17:43   ` [Intel-gfx] " Werner Sembach
2021-06-08 17:43 ` [PATCH v2 2/7] drm/uAPI: Add "active bpc" as feedback channel for "max bpc" drm property Werner Sembach
2021-06-08 17:43   ` Werner Sembach
2021-06-08 17:43   ` [Intel-gfx] " Werner Sembach
2021-06-10  7:55   ` Pekka Paalanen
2021-06-10  7:55     ` Pekka Paalanen
2021-06-10  7:55     ` [Intel-gfx] " Pekka Paalanen
2021-06-10  7:55     ` Pekka Paalanen
2021-06-14 15:59     ` Mario Kleiner
2021-06-14 15:59       ` Mario Kleiner
2021-06-14 15:59       ` [Intel-gfx] " Mario Kleiner
2021-06-14 15:59       ` Mario Kleiner
2021-06-08 17:43 ` [PATCH v2 3/7] drm/amd/display: Add handling for new "active bpc" property Werner Sembach
2021-06-08 17:43   ` Werner Sembach
2021-06-08 17:43   ` [Intel-gfx] " Werner Sembach
2021-06-08 17:43 ` [PATCH v2 4/7] drm/i915/display: " Werner Sembach
2021-06-08 17:43   ` Werner Sembach
2021-06-08 17:43   ` [Intel-gfx] " Werner Sembach
2021-06-10 12:50   ` Maxime Ripard
2021-06-10 12:50     ` Maxime Ripard
2021-06-10 12:50     ` [Intel-gfx] " Maxime Ripard
2021-06-10 12:50     ` Maxime Ripard
2021-06-10 13:59     ` Ville Syrjälä
2021-06-10 13:59       ` Ville Syrjälä
2021-06-10 13:59       ` [Intel-gfx] " Ville Syrjälä
2021-06-10 13:59       ` Ville Syrjälä
2021-06-08 17:43 ` [PATCH v2 5/7] drm/uAPI: Add "active color format" drm property as feedback for userspace Werner Sembach
2021-06-08 17:43   ` Werner Sembach
2021-06-08 17:43   ` [Intel-gfx] " Werner Sembach
2021-06-10  8:11   ` Pekka Paalanen
2021-06-10  8:11     ` Pekka Paalanen
2021-06-10  8:11     ` [Intel-gfx] " Pekka Paalanen
2021-06-10  8:11     ` Pekka Paalanen
2021-06-08 17:43 ` [PATCH v2 6/7] drm/amd/display: Add handling for new "active color format" property Werner Sembach
2021-06-08 17:43   ` Werner Sembach
2021-06-08 17:43   ` [Intel-gfx] " Werner Sembach
2021-06-08 17:43 ` [PATCH v2 7/7] drm/i915/display: " Werner Sembach
2021-06-08 17:43   ` Werner Sembach
2021-06-08 17:43   ` [Intel-gfx] " Werner Sembach
2021-06-08 19:01 ` 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=162317888046.419.7614489114397128496@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=wse@tuxedocomputers.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.