From patchwork Thu Oct 27 23:57:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13022931 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 48939FA373D for ; Thu, 27 Oct 2022 23:58:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE73010E73F; Thu, 27 Oct 2022 23:58:08 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 565FE10E73F for ; Thu, 27 Oct 2022 23:58:05 +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 4Mz2gC1Qsxz4x1V; Fri, 28 Oct 2022 10:57:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1666915080; bh=ddrk81J8bHwCRad9ZM5gwOArNofx9a2KFHicAz+ouIc=; h=Date:From:To:Cc:Subject:From; b=RWKsvQBStioNmK5S90nGAkHGeQSQ/cdH0nKoINqdTlu/FTk7I/PHDYFVfmflU6eOu oyxVz09AoORPWaSd5IY8lvamT+QxwxCVQJSXepLYPvWymVGVM5UCQ9Vy0263QtagwO DNVBvOM8GGekl5nmEKwkzJqmrgF2yw9ETUHfeoZbxc3qgnoSPSbuiwQSmhsnIoKg+F erIjnZ6isfP4q4S+vEyIcCU0m+UJCp7aSrKZlbsPswME3EBNlMWxtETGUQ8NG2nQi/ umyD+UedHPn6RBzbccuDFnTPu/YvlW4AdhC/d3Wu1nBHFz+5oWq72DP6J5hEKagcAp U581BMDOKzxDA== Date: Fri, 28 Oct 2022 10:57:57 +1100 From: Stephen Rothwell To: Alex Deucher , Dave Airlie Subject: linux-next: manual merge of the amdgpu tree with the drm tree Message-ID: <20221028105757.123c05c9@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: Yifan Zhang , Linux Kernel Mailing List , DRI , Linux Next Mailing List , 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/amdgpu/amdgpu_vkms.c between commit: 7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base") from the drm tree and commit: 887e8cec55f2 ("drm/amdgpu: set fb_modifiers_not_supported in vkms") 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/amdgpu/amdgpu_vkms.c index 09dec2561adf,500a1dc4fe02..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c