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: 150437 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2218809vqo; Mon, 9 Oct 2023 18:34:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTHLVeqnM9xGODp0l6bNUYpKQJkYfcLePNLHTbTHHtaK/peC7BJkbNQEOL/Jd7+kHvNhX+ X-Received: by 2002:a05:6358:290f:b0:143:9b23:e850 with SMTP id y15-20020a056358290f00b001439b23e850mr20505484rwb.24.1696901659690; Mon, 09 Oct 2023 18:34:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696901659; cv=none; d=google.com; s=arc-20160816; b=o9BUW0w8NVFINcvrg5xwsfSxO/wlgosy46SPlFLgdgguYIxa+cl9Dw5Fi2Swlepm4e PX1Xl5z8d/oCESUq6Fj0FJpwEiRyIIniDZYP7O7qMx06IXIyYwWWmQpR8lcStf4KOYwe Cd8nNX1wsccs6izgeY1APLvRo7OKg5QT8qCyjBEbQPuGneGFcwrfWGqqSr/iWVbjL5MO dp7ocquozumypV1IxnzpRnaivjaj+a2zzGbobdBSKO3A+eZCm2CVNDHZRuZYEq4agHq+ 52tSs64BMTW9Px9FDsYlFS1HJPy9Amk7lHaquyCHmhftpYz/UUwD3YhrmHdECSWBlLJM u2Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=mZxda45LSjxRlWdtqkpi6JYNGMZ5G2NJZ3ktd0qA/V4=; fh=RTkVnoiDkuR9+lvRc9Ku6PTt0997v00a+udXPLFEZbo=; b=L9hwTitbWjqF9vS81Zp6XhPhPLDghbydawM7RHguEjwA+YAKZQs0zpW35RqTL7c9sp ljuGDbeBwD6jgmy17BnBHVe1nYeBgvabK5y1YkKvoB9HDAwsmLBIbNEDddMptFmAyU18 MHeD2hI4Kh+uOot3cJycKmVparmDfeatSGVpbucCwth2nbuapOZyYz0fP9IUFGMVjNzn H5BgmDJl4sQqpRnUuncq1KW/GEceJ9CgtcHnQucVs7f9OqgoAyfGpoIPBt279dE6iXNu MRcWFAfgQWnrWFLEifZH4DjiIfXS3+Q22oKgkQQioKo6brG0C2bTwV3odduFqsUdUddm OdmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=E0TLdRRA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id ob4-20020a17090b390400b00274d6373fe1si14152914pjb.120.2023.10.09.18.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 18:34:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=E0TLdRRA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 22DC18029116; Mon, 9 Oct 2023 18:34:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379347AbjJJBeB (ORCPT + 19 others); Mon, 9 Oct 2023 21:34:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379299AbjJJBdx (ORCPT ); Mon, 9 Oct 2023 21:33:53 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 715D09E; Mon, 9 Oct 2023 18:33:49 -0700 (PDT) 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 Cc: Dmitry Baryshkov , Javier Martinez Canillas , Linux Kernel Mailing List , Linux Next Mailing List , Qi Zheng , Rob Clark , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , DRI 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-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 09 Oct 2023 18:34:17 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779330354611031018 X-GMAIL-MSGID: 1779330354611031018 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