From patchwork Wed Feb 26 01:12:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13991209 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 8D113C021BB for ; Wed, 26 Feb 2025 01:13:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A96810E824; Wed, 26 Feb 2025 01:13:02 +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="kKAVD3Oh"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32BA310E1F9; Wed, 26 Feb 2025 01:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1740532369; bh=8+YF4WFZgfiQeCGthkw8NzPmGBGE8t9U5bXWZoc+C7U=; h=Date:From:To:Cc:Subject:From; b=kKAVD3OhFHtQ8oFLbHcD73XfYGgflGP/aKxegtq0e76Kuf1zKXZGaS/Ua7athnf1R 9pXfkgXY08K9Qu8lfgZ4j1BfiQHmW9hvW8rA/y7EVbc3a+GHdJsGf8Ve2ms0tmauwO n5u5UKg6FXAdLrTZoQw5+NJXRqOZKytzLgAzeBid5eBD36Ttw2vzea18OqF53CV7Vi UZAIAZbNAxZ7zrxNbickkrnqs+RX/vyRIHS+qDJZlrMERWJ7tABbFjrfZj3chmNbAm YmpXqVIUQQhU8oBIWZH1WRfR5Hh2B+FOOpW0qIaus5e1mGyXGd7oeu5IepB+jPlhnY 98mPA0E759ZNw== 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 4Z2c0J3p1Tz4wby; Wed, 26 Feb 2025 12:12:48 +1100 (AEDT) Date: Wed, 26 Feb 2025 12:12:47 +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 , Jani Nikula , 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: <20250226121247.5d4d43ea@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: d41d048043c4 ("drm/xe/display: Drop xe_display_driver_remove()") 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,279b786d64dc..000000000000 --- a/drivers/gpu/drm/xe/display/xe_display.c