From patchwork Tue May 30 01:59:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13259105 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 26B42C77B7E for ; Tue, 30 May 2023 01:59:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E22110E113; Tue, 30 May 2023 01:59:26 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id CE1CB10E113 for ; Tue, 30 May 2023 01:59:23 +0000 (UTC) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QVbDR63vwz4x3g; Tue, 30 May 2023 11:59:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1685411960; bh=ZRNRNDCKoqP4EaUu6722Asf28ywaHAK6fod38WQkMa8=; h=Date:From:To:Cc:Subject:From; b=KfZ5SPXnqLZECGo7TOzigpIlRkvZ9I4GYDuzC/OoF8dC0lAzfpbIUo9ucq6pKvmvv BBdFlA9oxc0C349zdC4CoykmCxUoiUTKHjKr0/wHk2NNrTDIFsOzKZugJhZ5RVtH/f FrFrWdLh32lgf6Ztgp46o1w3mjZTQ3qXOwiFhvOVoQ6ZKlvIQn0BU9y89P6eo4WsnS huegsR9H5MfXgUpEAKHbBtZbKFyhK9StE7yl9qB0r80+KiHiVQPEiFlDrwGeOvWrra ED6k/xriABjSTrVyrX+DZaXUFCxNcfPbn9sPg9SXM/gOA5q1xfda4AnlaC74t/yGvy 2oPr3SiPF5OAg== Date: Tue, 30 May 2023 11:59:19 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Dave Airlie Subject: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20230530115919.2b8bcf29@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: , Cc: Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Andi Shyti , Matt Roper Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: 66ca1d8f222b ("drm/i915/i915_drv: Use i915 instead of dev_priv insied the file_priv structure") from the drm tree and commits: 5af5169d7582 ("drm/i915: Convert INTEL_INFO()->display to a pointer") 18e0deeed8c8 ("drm/i915/display: Move display runtime info to display structure") 95c08508e237 ("drm/i915/display: Move feature test macros to intel_display_device.h") from the drm-intel 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/i915/i915_drv.h index f23b030aaf09,e9c403def9c9..000000000000 --- a/drivers/gpu/drm/i915/i915_drv.h