From patchwork Mon Jan 16 00:48:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13102479 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 54AF7C3DA78 for ; Mon, 16 Jan 2023 00:48:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 23D8A10E089; Mon, 16 Jan 2023 00:48:10 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A8BE10E089; Mon, 16 Jan 2023 00:48:06 +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 4NwD012FZJz4xN4; Mon, 16 Jan 2023 11:48:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1673830082; bh=Kk7LmYSiUdabC6NM/uJYVXidhPuM75gjB2dhBJCY2FE=; h=Date:From:To:Cc:Subject:From; b=gWcBwY3K/CV0U3EKvugXlSHcO4b1zPtcQCj5abYNNXrYeGf/43f4aPYOVb76ucw9K tKBCiLlRwcWN3qPLk31EJbfMwf7Dokj9KNh9Rg6qhoXUStYJwJBeSSi3zYMEr4VOTY wNk2qe9omm6hvjcdQJGM89pqNB73lqHYFkVZW50tN69/WTDu/ZXNEiClLZ9ukf4jAP eOlZbdrj5e1HhYCLZoW9e5tokoTwSoHQFomqS1aK3Er5Te4Gw1iF1cttzXxQDD4L6U oOt2fNr0xnzufyRBwfzUIHvzuXqvuNZs5bO9Z4uFJNRx5F1L5RFk6/rg+wtRkDwS4a JG9yLF8GZ9sIA== Date: Mon, 16 Jan 2023 11:48:00 +1100 From: Stephen Rothwell To: Alex Deucher , Daniel Vetter Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree Message-ID: <20230116114800.1c679494@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 , Wenjing Liu , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann , Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c between commit: a6276e92a037 ("drm: Include where needed") from the drm-misc tree and commit: a98cdd8c4856 ("drm/amd/display: refactor ddc logic from dc_link_ddc to link_ddc") from the amdgpu 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/amd/display/amdgpu_dm/amdgpu_dm.c index 55a845eb0c6d,7bf21bb52a7d..000000000000 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c