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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B76CC433E0 for ; Mon, 18 Jan 2021 07:33:09 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2C8982074D for ; Mon, 18 Jan 2021 07:33:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C8982074D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=emeril.freedesktop.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FE7B6E0EC; Mon, 18 Jan 2021 07:33:08 +0000 (UTC) Received: from emeril.freedesktop.org (emeril.freedesktop.org [131.252.210.167]) by gabe.freedesktop.org (Postfix) with ESMTP id 047F16E0EE; Mon, 18 Jan 2021 07:33:07 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id F06BCA0019; Mon, 18 Jan 2021 07:33:06 +0000 (UTC) MIME-Version: 1.0 From: Patchwork To: "Anshuman Gupta" Date: Mon, 18 Jan 2021 07:33:06 -0000 Message-ID: <161095518695.28164.5277911021350239578@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <20210118060730.15425-1-sean.z.huang@intel.com> In-Reply-To: <20210118060730.15425-1-sean.z.huang@intel.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBJ?= =?utf-8?q?ntroduce_Intel_PXP_component_-_Mesa_single_session_=28rev22=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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == Series Details == Series: Introduce Intel PXP component - Mesa single session (rev22) URL : https://patchwork.freedesktop.org/series/84620/ State : failure == Summary == Applying: drm/i915/pxp: Add plane decryption support Applying: drm/i915/pxp: set KCR reg init during the boot time Using index info to reconstruct a base tree... A drivers/gpu/drm/i915/pxp/intel_pxp.c Falling back to patching base and 3-way merge... CONFLICT (modify/delete): drivers/gpu/drm/i915/pxp/intel_pxp.c deleted in HEAD and modified in drm/i915/pxp: set KCR reg init during the boot time. Version drm/i915/pxp: set KCR reg init during the boot time of drivers/gpu/drm/i915/pxp/intel_pxp.c left in tree. 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/i915/pxp: set KCR reg init during the boot time 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