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 37767C36010 for ; Tue, 1 Apr 2025 12:59:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7F4C10E5AC; Tue, 1 Apr 2025 12:59:33 +0000 (UTC) Received: from e6b6f09ec485 (emeril.freedesktop.org [131.252.210.167]) by gabe.freedesktop.org (Postfix) with ESMTPS id B129F10E59E; Tue, 1 Apr 2025 12:59:32 +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_hdrtest=3A_hide_the_disgu?= =?utf-8?q?sting_turds?= From: Patchwork To: "Jani Nikula" Cc: intel-gfx@lists.freedesktop.org Date: Tue, 01 Apr 2025 12:59:32 -0000 Message-ID: <174351237271.22413.2807281599249456080@e6b6f09ec485> X-Patchwork-Hint: ignore References: <20250401121830.21696-1-jani.nikula@intel.com> In-Reply-To: <20250401121830.21696-1-jani.nikula@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: hdrtest: hide the disgusting turds URL : https://patchwork.freedesktop.org/series/147058/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/147058/revisions/1/mbox/ not applied Applying: drm: place header test files in .hdrtest subdirectories Applying: drm/xe: place header test files in .hdrtest subdirectories Applying: drm/i915: place header test files in .hdrtest subdirectories Applying: kbuild: hdrtest: place header test files in .hdrtest subdirectories Applying: drm: add config option for extra build-time checks Using index info to reconstruct a base tree... M drivers/gpu/drm/Kconfig Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/Kconfig 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: add config option for extra build-time checks 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