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 35F96CD1284 for ; Fri, 29 Mar 2024 01:15:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BE4F10E939; Fri, 29 Mar 2024 01:15:45 +0000 (UTC) Received: from 8e613ede5ea5 (emeril.freedesktop.org [131.252.210.167]) by gabe.freedesktop.org (Postfix) with ESMTPS id C162310E939; Fri, 29 Mar 2024 01:15:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: =?utf-8?q?=E2=9C=97_Fi=2ECI=2EBUILD=3A_failure_for_spi=3A_add_driver_for_Int?= =?utf-8?q?el_discrete_graphics?= From: Patchwork To: "Alexander Usyskin" Cc: intel-gfx@lists.freedesktop.org Date: Fri, 29 Mar 2024 01:15:43 -0000 Message-ID: <171167494379.1064396.308318191260583289@8e613ede5ea5> X-Patchwork-Hint: ignore References: <20240328122236.1718111-1-alexander.usyskin@intel.com> In-Reply-To: <20240328122236.1718111-1-alexander.usyskin@intel.com> 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == Series Details == Series: spi: add driver for Intel discrete graphics URL : https://patchwork.freedesktop.org/series/131763/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/131763/revisions/1/mbox/ not applied Applying: spi: add auxiliary device for intel dg spi Applying: drm/i915/spi: add spi device for discrete graphics Applying: drm/i915/spi: add intel_spi_region map Applying: drm/i915/spi: add support for access mode Applying: spi: add driver for intel graphics on-die spi device Applying: spi: intel-dg: implement region enumeration Applying: spi: intel-dg: implement spi access functions Applying: spi: intel-dg: spi register with mtd Applying: spi: intel-dg: implement mtd access handlers Applying: spi: intel-dg: align 64bit read and write Applying: spi: intel-dg: wake card on operations Applying: drm/xe/spi: add on-die spi device Using index info to reconstruct a base tree... M drivers/gpu/drm/xe/Makefile M drivers/gpu/drm/xe/xe_device.c M drivers/gpu/drm/xe/xe_device_types.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_device_types.h Auto-merging drivers/gpu/drm/xe/xe_device.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.c Auto-merging drivers/gpu/drm/xe/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0012 drm/xe/spi: add on-die spi device 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