✗ Fi.CI.BUILD: failure for Enable Adaptive Sync SDP Support for DP (rev19)

From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Mitul Golani" <mitulkumar.ajitkumar.golani@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for Enable Adaptive Sync SDP Support for DP (rev19)
Date: Mon, 18 Mar 2024 21:12:18 -0000	[thread overview]
Message-ID: <171079633883.886732.18146907695689667268@8e613ede5ea5> (raw)
In-Reply-To: <20240311094238.3320888-1-mitulkumar.ajitkumar.golani@intel.com>

== Series Details ==

Series: Enable Adaptive Sync SDP Support for DP (rev19)
URL   : https://patchwork.freedesktop.org/series/126829/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/126829/revisions/19/mbox/ not applied
Applying: drm/dp: Add support to indicate if sink supports AS SDP
Applying: drm: Add Adaptive Sync SDP logging
Applying: drm/i915/display: Add crtc state dump for Adaptive Sync SDP
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_crtc_state_dump.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_crtc_state_dump.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_crtc_state_dump.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: Add crtc state dump for Adaptive Sync SDP
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".
Build failed, no error log produced