From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Sean Paul" <sean@poorly.run>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/hdcp: Pull HDCP auth/exchange/check into helpers (rev8)
Date: Fri, 31 Mar 2023 22:17:52 -0000 [thread overview]
Message-ID: <168030107285.14985.10366323977937279231@emeril.freedesktop.org> (raw)
In-Reply-To: <20230331221213.1691997-1-markyacoub@google.com>
== Series Details ==
Series: drm/hdcp: Pull HDCP auth/exchange/check into helpers (rev8)
URL : https://patchwork.freedesktop.org/series/94712/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/94712/revisions/8/mbox/ not applied
Applying: drm/hdcp: Add drm_hdcp_atomic_check()
Applying: drm/hdcp: Avoid changing crtc state in hdcp atomic check
Applying: drm/hdcp: Update property value on content type and user changes
Applying: drm/hdcp: Expand HDCP helper library for enable/disable/check
Applying: drm/i915/hdcp: Consolidate HDCP setup/state cache
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_hdcp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 drm/i915/hdcp: Consolidate HDCP setup/state cache
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
prev parent reply other threads:[~2023-03-31 22:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-31 22:12 [Intel-gfx] [PATCH v8 00/10] drm/hdcp: Pull HDCP auth/exchange/check into helpers Mark Yacoub
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 01/10] drm/hdcp: Add drm_hdcp_atomic_check() Mark Yacoub
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 02/10] drm/hdcp: Avoid changing crtc state in hdcp atomic check Mark Yacoub
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 03/10] drm/hdcp: Update property value on content type and user changes Mark Yacoub
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 04/10] drm/hdcp: Expand HDCP helper library for enable/disable/check Mark Yacoub
2023-04-01 0:19 ` kernel test robot
2023-04-03 6:38 ` Kandpal, Suraj
2023-04-07 16:32 ` Dmitry Baryshkov
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 05/10] drm/i915/hdcp: Consolidate HDCP setup/state cache Mark Yacoub
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 06/10] drm/i915/hdcp: Retain hdcp_capable return codes Mark Yacoub
2023-04-03 6:41 ` Kandpal, Suraj
2023-04-03 6:45 ` Kandpal, Suraj
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 07/10] drm/i915/hdcp: Use HDCP helpers for i915 Mark Yacoub
2023-04-03 6:59 ` Kandpal, Suraj
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 08/10] dt-bindings: msm/dp: Add bindings for HDCP registers Mark Yacoub
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 09/10] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller Mark Yacoub
2023-04-07 16:34 ` Dmitry Baryshkov
2023-04-07 16:34 ` Dmitry Baryshkov
2023-03-31 22:12 ` [Intel-gfx] [PATCH v8 10/10] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers Mark Yacoub
2023-04-01 3:44 ` kernel test robot
2023-03-31 22:17 ` 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=168030107285.14985.10366323977937279231@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sean@poorly.run \
/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;
as well as URLs for NNTP newsgroup(s).