From patchwork Tue Oct 10 01:33:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13414734 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 76F47CD68E3 for ; Tue, 10 Oct 2023 01:33:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BB74910E30B; Tue, 10 Oct 2023 01:33:57 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FC5610E30B for ; Tue, 10 Oct 2023 01:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696901628; bh=mZxda45LSjxRlWdtqkpi6JYNGMZ5G2NJZ3ktd0qA/V4=; h=Date:From:To:Cc:Subject:From; b=E0TLdRRAPRiKWzXfCCSp+m93yqyS+Q5LMghXvLWiV6YYmGFpPCDx6B3+Pt+yYU6TI ZJd5/Q/NQFdxdo6ti+a5Ibd+PWWr8TbdDWgi+uZbprOLG6pNv5zzqBC/8MPzoBtw8U 3FZCfnhGVkZMK8s5igoHtSiUIyb3NOJEYKtM3+239saqTRDQxdSpgkI19xFw4vNGXs ULTHTy4QKpNWBMPljaXEi0foUG17siqFXMKv9sGzVkzo4lcPUPU+ZSyNPeJAycChUF DDIQQgcowNSNmm3iDLO35FCaBoSKj2ux7qMjdAmMMQiCa7hJX4v8imYlI1ty0fFKh+ inLmp/zTmPL9A== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S4JMZ2ST8z4xSn; Tue, 10 Oct 2023 12:33:46 +1100 (AEDT) Date: Tue, 10 Oct 2023 12:33:45 +1100 From: Stephen Rothwell To: Rob Clark , Sean Paul , Andrew Morton , Dave Airlie Subject: linux-next: manual merge of the drm-msm tree with the mm, drm trees Message-ID: <20231010123345.12bfda28@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: Rob Clark , Javier Martinez Canillas , Qi Zheng , Linux Kernel Mailing List , Linux Next Mailing List , DRI , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , Dmitry Baryshkov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the drm-msm tree got conflicts in: drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c drivers/gpu/drm/msm/msm_drv.c between commits: 01790d5e372f ("drm/msm: Convert to platform remove callback returning void") cd61a76c210a ("drm/msm: dynamically allocate the drm-msm_gem shrinker") from the mm, drm trees and commits: 283add3e6405 ("drm/msm: remove shutdown callback from msm_platform_driver") 506efcba3129 ("drm/msm: carve out KMS code from msm_drv.c") from the drm-msm 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/msm/disp/dpu1/dpu_kms.c index 82381d12414d,d14ae316796c..000000000000 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c diff --cc drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index e5012fa6771f,982b7689e5b6..000000000000 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 8a7b44376bc6,a28fbcd09684..000000000000 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c diff --cc drivers/gpu/drm/msm/msm_drv.c index 05fe32c3a4b4,401e9ef86074..000000000000 --- a/drivers/gpu/drm/msm/msm_drv.c