From patchwork Thu Jun 27 15:00:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13714561 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 9422BC2BD09 for ; Thu, 27 Jun 2024 15:00:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B176D10E0A7; Thu, 27 Jun 2024 15:00:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="QuTRXVnx"; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7201610E0F7 for ; Thu, 27 Jun 2024 15:00:49 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C912B61DE2; Thu, 27 Jun 2024 15:00:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E79CC2BBFC; Thu, 27 Jun 2024 15:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719500448; bh=tRy9SRr/CPS5is3VqgbmrQWOvnGMxmc+yYVzPk/KzTA=; h=Date:From:To:Cc:Subject:From; b=QuTRXVnx6PQBh3Ifc3bXcfIpsmGSUWK7UmFsmOtWiClWmmiX1jZ7d9kZJJyoJVDf1 KrxjtYz3bOxoHEuohXern8M3GICcIMBn42oioz2FlVKAkA/b6uIRoRnbdgDsCD9781 AzgDDSt3oQzO6+B6P2WXTlomfFvWZVIQRVfmo3MLUJUByOXt78cl5e2XreZ+kCqr5I 6CIoBryX3TjHSM5FiurxGeaudMw8gBB5qTAsfsPhNGYoxt7D/WA3tEJDLPde7s9SXe dxCq10u0biT1f8z05cIX2gnoWy2Xx8wSGM5PuB6Ti8yRXmhEM/EQZDwDfp1o0ljKtq eOiq6lLGp5vng== Date: Thu, 27 Jun 2024 16:00:43 +0100 From: Mark Brown To: Dave Airlie , DRI Cc: Alex Deucher , Frank Min , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Message-ID: MIME-Version: 1.0 Content-Disposition: inline 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: , 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/amdgpu/amdgpu_atomfirmware.c between commit: f6f49dda49db7 ("drm/amdgpu/atomfirmware: fix parsing of vram_info") from the drm-fixes tree and commit: 9a55c77978308 ("drm/amdgpu: fix getting vram info for gfx12") from the drm 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. +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c index 2e13c7c4b2b41,f932bec6e5345..0000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c