From patchwork Mon Feb 17 00:52:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13976967 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 55758C02198 for ; Mon, 17 Feb 2025 00:52:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C8DA10E2FD; Mon, 17 Feb 2025 00:52:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="nEbQoif5"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id D94C410E0B0; Mon, 17 Feb 2025 00:52:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1739753556; bh=KSGXX34I/Tc3wWb6KX2w22KlpznNooZZpfVa6bYJsVY=; h=Date:From:To:Cc:Subject:From; b=nEbQoif5EH05HtDuvc1hsjRpKytrdOkBUEBr1Ns45Ciqa+vO5AV7lacI/2N9UKQdr UMSjrjCzEbYBiVfzTWn8MV2KpuBR2SRc2WA3gC6P7uTP7d17CfiXs0NL82gIOZ/a9k KMbQiYTvE1GYjpX4UEZW78/XSCkMVgy8RljPpt4vGyP1AOeXHeTQXM+6SQE3UJABgZ 9u5OLmhauuA6Xup0fiZO+bSlDEP1HeCu2LSGLzdbM6jx1FZDjLay8/9Gpa09zRtihe 6ja5XwpZSb775p1Rakg/ozc1oxS7mI6kY4iSFEr2y3nt7fPAzsT2iaZm7+n6SuMXXF 9wLw5l+9Q4z8g== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Yx3z72dDlz4wd0; Mon, 17 Feb 2025 11:52:35 +1100 (AEDT) Date: Mon, 17 Feb 2025 11:52:34 +1100 From: Stephen Rothwell To: Lucas De Marchi , Thomas =?utf-8?q?Hellstr?= =?utf-8?q?=C3=B6m?= , Simona Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Intel Graphics , DRI , DRM XE List , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm-xe tree with the drm-intel tree Message-ID: <20250217115234.2a39f6f6@canb.auug.org.au> MIME-Version: 1.0 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-xe tree got a conflict in: drivers/gpu/drm/xe/display/xe_display.c between commit: 1b242ceec536 ("drm/i915/audio: convert to struct intel_display") from the drm-intel tree and commit: 8b3f09fb44a3 ("drm/xe: Fix xe_display_fini() calls") from the drm-xe tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/gpu/drm/xe/display/xe_display.c index 96ba9595bf2a,ac0804726e55..000000000000 --- a/drivers/gpu/drm/xe/display/xe_display.c