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 99ABBC4828D for ; Tue, 6 Feb 2024 01:28:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1334B112776; Tue, 6 Feb 2024 01:28:55 +0000 (UTC) Received: from 5338d5abeb45 (emeril.freedesktop.org [131.252.210.167]) by gabe.freedesktop.org (Postfix) with ESMTPS id A61F4112775; Tue, 6 Feb 2024 01:28:53 +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_linux-next=3A_build_failu?= =?utf-8?q?re_after_merge_of_the_drm-misc_tree?= From: Patchwork To: "Stephen Rothwell" Cc: intel-gfx@lists.freedesktop.org Date: Tue, 06 Feb 2024 01:28:53 -0000 Message-ID: <170718293368.1024443.383223628340185209@5338d5abeb45> X-Patchwork-Hint: ignore References: <20240206122822.12a2df89@canb.auug.org.au> In-Reply-To: <20240206122822.12a2df89@canb.auug.org.au> 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: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/129558/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/129558/revisions/1/mbox/ not applied Applying: linux-next: build failure after merge of the drm-misc tree Using index info to reconstruct a base tree... M drivers/gpu/drm/xe/xe_bo.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_bo.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bo.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 linux-next: build failure after merge of the drm-misc tree 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