From patchwork Mon Oct 14 03:24:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13834127 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 E99E3D1A427 for ; Mon, 14 Oct 2024 03:24:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D54510E26D; Mon, 14 Oct 2024 03:24:49 +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="i52m3GTZ"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id C594510E1C5; Mon, 14 Oct 2024 03:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1728876281; bh=vsCrLNHWS9aX1Ot8mwWPJBHzbluUUToFirZ71fWGFDg=; h=Date:From:To:Cc:Subject:From; b=i52m3GTZPdS/NbEffenH7z35LD1OSo/ryvAKSA1lY6+S5x2uIEx86jNor6ePLYO3m 5muO1kuCKmK8MBqypRqVo0LDSIuSc+KrlOpZmUyXcTKbiSpHEkU7yotF4USrTpLVTf 6Gy/lnI4KFJO2dLJZOEgvTRmpGqwtH8bWuQYDR1Oyp0VVV1dRNbRHEWJgbeyBc+JiI sgRNsmziLITOjjvMLLL4sQVAHay+qlEusidxQmNUf9oKI4iuyiOkTWL91UYef0YQzi wKagNBz0MEFdFib2NkXdc5F4O6uEEQzZTmaucZTqXgzNRgBiZrpUwcTlFkYBF7CGBI fYVP7OkknGkMQ== 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 4XRjJl5vVQz4x8H; Mon, 14 Oct 2024 14:24:39 +1100 (AEDT) Date: Mon, 14 Oct 2024 14:24:39 +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: Imre Deak , Intel Graphics , DRI , DRM XE List , Linux Kernel Mailing List , Linux Next Mailing List , Ville =?utf-8?b?U3ly?= =?utf-8?b?asOkbMOk?= Subject: linux-next: manual merge of the drm-xe tree with the drm-intel tree Message-ID: <20241014142439.40e63852@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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: 5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display") from the drm-intel tree and commit: a4de6beb83fc ("drm/xe/display: Separate the d3cold and non-d3cold runtime PM handling") 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 957ae763531d,5c6b74c36b60..000000000000 --- a/drivers/gpu/drm/xe/display/xe_display.c