From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 21527C761A6 for ; Fri, 31 Mar 2023 22:18:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1EBCD10E55B; Fri, 31 Mar 2023 22:18:00 +0000 (UTC) Received: from emeril.freedesktop.org (emeril.freedesktop.org [IPv6:2610:10:20:722:a800:ff:feee:56cf]) by gabe.freedesktop.org (Postfix) with ESMTP id F1A7410E55B; Fri, 31 Mar 2023 22:17:52 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id D7494A882E; Fri, 31 Mar 2023 22:17:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Patchwork To: "Sean Paul" Date: Fri, 31 Mar 2023 22:17:52 -0000 Message-ID: <168030107285.14985.10366323977937279231@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20230331221213.1691997-1-markyacoub@google.com> In-Reply-To: <20230331221213.1691997-1-markyacoub@google.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBk?= =?utf-8?q?rm/hdcp=3A_Pull_HDCP_auth/exchange/check_into_helpers_=28rev8?= =?utf-8?q?=29?= X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: intel-gfx@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == 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