All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: "José Roberto de Souza" <jose.souza@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [v9,1/5] drm: Add function to convert rect in 16.16 fixed format to regular format (rev2)
Date: Wed, 23 Dec 2020 14:48:32 -0000	[thread overview]
Message-ID: <160873491299.26587.17315896355915746294@emeril.freedesktop.org> (raw)
In-Reply-To: <20201218184701.111857-1-jose.souza@intel.com>

== Series Details ==

Series: series starting with [v9,1/5] drm: Add function to convert rect in 16.16 fixed format to regular format (rev2)
URL   : https://patchwork.freedesktop.org/series/85092/
State : failure

== Summary ==

Applying: drm: Add function to convert rect in 16.16 fixed format to regular format
Applying: drm/i915/display/psr: Use plane damage clips to calculate damaged area
Applying: drm/i915/display: Split and export main surface calculation from skl_check_main_surface()
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display.c
M	drivers/gpu/drm/i915/display/intel_display.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.h
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915/display: Split and export main surface calculation from skl_check_main_surface()
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:[~2020-12-23 14:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-18 18:46 [PATCH v9 1/5] drm: Add function to convert rect in 16.16 fixed format to regular format José Roberto de Souza
2020-12-18 18:46 ` [Intel-gfx] " José Roberto de Souza
2020-12-18 18:46 ` [Intel-gfx] [PATCH v9 2/5] drm/i915/display/psr: Use plane damage clips to calculate damaged area José Roberto de Souza
2020-12-23 11:53   ` Mun, Gwan-gyeong
2020-12-18 18:46 ` [Intel-gfx] [PATCH v9 3/5] drm/i915/display: Split and export main surface calculation from skl_check_main_surface() José Roberto de Souza
2020-12-18 18:47 ` [Intel-gfx] [PATCH v9 4/5] drm/i915/display/psr: Program plane's calculated offset to plane SF register José Roberto de Souza
2020-12-18 18:47 ` [Intel-gfx] [PATCH v9 5/5] HAX/DO_NOT_MERGE_IT: drm/i915/display: Enable PSR2 selective fetch for testing José Roberto de Souza
2020-12-18 20:56 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [v9,1/5] drm: Add function to convert rect in 16.16 fixed format to regular format Patchwork
2020-12-18 21:24 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2020-12-21 10:45 ` [PATCH v9 1/5] " Mun, Gwan-gyeong
2020-12-21 10:45   ` [Intel-gfx] " Mun, Gwan-gyeong
2020-12-23 14:48 ` 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=160873491299.26587.17315896355915746294@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jose.souza@intel.com \
    --subject='Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [v9,1/5] drm: Add function to convert rect in 16.16 fixed format to regular format (rev2)' \
    /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

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.