From patchwork Tue Jan 24 23:42:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13114879 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 A15B0C38142 for ; Tue, 24 Jan 2023 23:42:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97C8A10E08B; Tue, 24 Jan 2023 23:42:58 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9148610E08B; Tue, 24 Jan 2023 23:42:56 +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 4P1k6d5Vx0z4xwy; Wed, 25 Jan 2023 10:42:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1674603771; bh=kPBi/8E5CuSntCZaz43tWi9KctTXAvdEQiXJjhsQLOQ=; h=Date:From:To:Cc:Subject:From; b=H0+6J647IHzPsBmfE8Ycy+AKyzIHUVY4jVmE8deFienUcyjmkJuC7egk95FPRorxs /KM8NAwIVmTlyzGKDFH7Pr+4FYEK4WNSWPvE1WrexBn4X/TsGf5PLTbZFqyStp8vMI pYFzdE1cnP+bD1X4YYVWoeDzDO3JBEl3OYJDVB1STPSSwsdmdZfi2KwOYILr97gJgm qjJQ85RSE8cD3gwYkJz0rcpPZHzjBNsGsTBsl+5WsM8vrpGQ0TZPjRub1/e+vlQlFR z2XdUtXwUfWzg2w6TjrDj62Hv7glTUNrfzAxqhXte5LVKszcNg2OqQEaSKDEFD+PHb oB4q0v6ZDIe8g== Date: Wed, 25 Jan 2023 10:42:48 +1100 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: <20230125104248.1e9775ca@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: Alan Previn , Jani Nikula , Intel Graphics , Linux Kernel Mailing List , DRI , Daniele Ceraolo Spurio , Linux Next Mailing List 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: f67986b0119c ("drm/i915/pxp: Promote pxp subsystem to top-level of i915") from the drm tree and commit: a3f839762ceb ("drm/i915: move pch_ssc_use to display sub-struct under dpll") 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 48fd82722f12,ac4c3c6f5541..000000000000 --- a/drivers/gpu/drm/i915/i915_drv.h