From patchwork Fri Aug 18 01:53:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13357215 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 38E8FC71132 for ; Fri, 18 Aug 2023 01:53:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B06DE10E2EF; Fri, 18 Aug 2023 01:53:33 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 51A3F10E2EF for ; Fri, 18 Aug 2023 01:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1692323607; bh=3f0zBTiA//5gGXx/qQ6dBzFcQCrtR5703PUhKpUb/WU=; h=Date:From:To:Cc:Subject:From; b=SxlucnBtkFrel1BIAzdK0fUNyASUo5Ha22yxge1VUmeUCo8NJumyGzsyVtmeHkrj2 wi4cQ85qT3Tu+m8Iw1zCJNfIwStzSE05R7O/vI0BKoP28f4YZdcPFLROqb2tW402r7 mu7NIJZ28TeKrRwf5U1uM8REOL58/Y0R8v6e5O9mKKqV+NH5JBZRFsAM3agqzwxTJQ Xy73WB870HiQMFs7rie7KHJN/BsILjRxKvco/DnIi/yE+hjfux42wVPI8Lrt0g1vIa ZoOWuC0lE3X5jNwE+wlXnIE7eN0bqbf6EYplcVF9VvPrzzf3+m9nexcsEK3XlnybG2 /oOTcfZ9z/hlQ== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RRlJk2yrkz4wxR; Fri, 18 Aug 2023 11:53:26 +1000 (AEST) Date: Fri, 18 Aug 2023 11:53:25 +1000 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Message-ID: <20230818115325.3ea01fcd@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: Alex Deucher , Linux Next Mailing List , Evan Quan , Kenneth Feng , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c between commits: 61319b8e3b58 ("drm/amd/pm: disable the SMU13 OD feature support temporarily") b6360a5ec31d ("drm/amd/pm: disallow the fan setting if there is no fan on smu 13.0.0") from the drm-fixes tree and commit: 510d242f498a ("drm/amd/pm: disable the SMU13 OD feature support temporarily") from the drm tree. The git automatic resolution got this wrong by adding an extra "#if 0" above the duplicated "PPTable_t *pptable = smu->smu_table.driver_pptable;" from b6360a5ec31d. 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/pm/swsmu/smu13/smu_v13_0_0_ppt.c index 0fb6be11a0cc,fddcd834bcec..000000000000 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c