From patchwork Fri Sep 6 03:15:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13793180 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 B0334CE7AA5 for ; Fri, 6 Sep 2024 03:15:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D41F810E963; Fri, 6 Sep 2024 03:15:11 +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="u7gtWNH6"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0EC9010E95D; Fri, 6 Sep 2024 03:15:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1725592504; bh=QMIlXfEUeKgJL/ulsag1T3e133MiIVGIWcDrY3RH+Ws=; h=Date:From:To:Cc:Subject:From; b=u7gtWNH6Jk/fXt/kPTWPmYn46m36/+XWV5rXDbFhpEhMbFV0KzSPxHuNXkwpUUwhu un11fJcv6HW/eeVsCxbhZ9nw4Z5P5ACPKqLRUtGl5nlEl/gIPR49l59sy2Y5qfPwaz CCyru6g3w7liA+94R9AIYqK2tJt/FJSZXCJKfExkQc/NcA+Kur5BNxABhizveFlQMC rBbMj2YqU1jUNXXsAvuIT2xOLYjsruzVbDYDpaPWbdemFPYsqpPI+GdgjrKYPphmdE eG0oj0befUe6EnzQ3zImoe5e3eyJOH4kdUMAhM5wrEGH5wPszCelbv0J0+w+e9dYJf TD1ksuAsByKtA== 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 4X0LvC2zVXz4wxx; Fri, 6 Sep 2024 13:15:03 +1000 (AEST) Date: Fri, 6 Sep 2024 13:15:02 +1000 From: Stephen Rothwell To: Lucas De Marchi , Thomas =?utf-8?q?Hellstr?= =?utf-8?q?=C3=B6m?= , Daniel 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: <20240906131502.7a7d1962@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: 11d0613af7c5 ("drm/i915/display: include drm/drm_probe_helper.h where needed") from the drm-intel tree and commit: 87d8ecf01544 ("drm/xe: replace #include with ") 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 303d00b99a68,75736faf2a80..000000000000 --- a/drivers/gpu/drm/xe/display/xe_display.c