From patchwork Tue Oct 24 00:52:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 157181 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1642474vqx; Mon, 23 Oct 2023 17:52:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLRQNvMl0PP+DQKLyUV3d6bd2HmR5GZjwKZ9NblcSXnVPjPzPxt8u/UAfuZ8UNUzbxEDjs X-Received: by 2002:a05:6a20:841b:b0:17a:dd8e:2dec with SMTP id c27-20020a056a20841b00b0017add8e2decmr1437508pzd.28.1698108737640; Mon, 23 Oct 2023 17:52:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698108737; cv=none; d=google.com; s=arc-20160816; b=QmI9x3vxWF34fQmTHWQr3T2K8xm+mjstmToAfkJVA1TA6M2/05hJquzZ5NPx+8Lq++ /3XR0dnCTVYugIr0aSbpgrIuyxB3/BR9/HLBptYJgbXZKYZ+V8Ex/HzMVJhEPgvmjmNL VWzuU1MHFPDmsV5Hv0O9rxQMDDrcsThGL1ga8bu6jY7jhlCBnfUUnEHr31oYBgK6OVBq 26hNVC4oIlD/D8VQGnrXi6S74kv1DiI2d1EoFxxtoK9rR7E1/7rlVFl3lamBq+Wh6ueQ NA6nXy3SARMTIW8pANQzWT8Jejp1j28mzkn9wnttDQ8j5817Fg7/y3ky5oEooE5toq7h 2JmQ== 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=pRZQGTQLgHsC5cvz7MkAgtW1cWzxBXH0WEqq3b3tmtA=; fh=jtR5dIkpvQkJ1ARHeUI4q7NYQygwPj72sskUWKmawos=; b=TnHqjr47dXt8hfasUYo/+kn+ny7eaTOkzzvDEnqNGzYmih4eshQTBp6rT5ggCtJynn UrStMhFppP2ssjlpdpNfodEwKnLDezGMv0SlV1/fFR9ece700ZS7u+LYg0u/gmYHNuNv 6Wg9DtLQJO5xUKcaEeH7bmJWIt+16rWp0riAlHIOcOruBscbbYzougsaby99zrGo1cms Gnv8W6U/+veYxkleiyrWXB0y61FMD+3wYO2uAFh623e7rU7qMcR30vDy2ciVpfm4qjn0 4vF9w3EN34+Ka4gggm6yvZV6vcZXygLs5UhLg2j6iECxerarcAO5w14AE1ZMLx3yV2cb 1Esw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=fCY2f+5x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id w19-20020a170902c79300b001ae40e07fb0si7215077pla.216.2023.10.23.17.52.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 17:52:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=fCY2f+5x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 0A18C80C5915; Mon, 23 Oct 2023 17:52:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231702AbjJXAwO (ORCPT + 27 others); Mon, 23 Oct 2023 20:52:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231199AbjJXAwN (ORCPT ); Mon, 23 Oct 2023 20:52:13 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A92E0C0; Mon, 23 Oct 2023 17:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698108729; bh=pRZQGTQLgHsC5cvz7MkAgtW1cWzxBXH0WEqq3b3tmtA=; h=Date:From:To:Cc:Subject:From; b=fCY2f+5xM6nW/2gZ5/mvBnNmICJ3SSKMTtujVhzaxnd1571LiCyVvzkeMH9IakXQn mrFdndvt7LeqzoRICPNLz45j5djwu60/9w3cU/hcTtdIO6nLc9Kj7rj8dYHC/Yuuwv aCHNkiEPAenxk+kCM09ym1QLAJwES85Ig0HH8IQyTSrzVaNfiCDs2dalEVFsgPGRni TbqPt0VxDLUWnx5uZUrggnMSjzzLKIri76hVzXFWzZuzkOWpI6SKUTgWna9AHY7oZY dRjiwUvsEstZtndR8OHTLCLtt7fk4bA/GzIGOt8a38jONyHu1Rjjc0O12lN/KJ0mei zjUkhpq9b5zfQ== 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 4SDtn42cbGz4wnv; Tue, 24 Oct 2023 11:52:08 +1100 (AEDT) Date: Tue, 24 Oct 2023 11:52:06 +1100 From: Stephen Rothwell To: Dave Airlie , Andrew Morton Cc: DRI , Dmitry Baryshkov , Linux Kernel Mailing List , Linux Next Mailing List , Qi Zheng , Rob Clark Subject: linux-next: manual merge of the drm tree with the mm-stable tree Message-ID: <20231024115206.4ce24d96@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 17:52:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780596067826127499 X-GMAIL-MSGID: 1780596067826127499 Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/msm/msm_drv.c between commit: cd61a76c210a ("drm/msm: dynamically allocate the drm-msm_gem shrinker") from the mm-stable tree and commit: 506efcba3129 ("drm/msm: carve out KMS code from msm_drv.c") 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. diff --cc drivers/gpu/drm/msm/msm_drv.c index 7f20249d6071,443bbc3ed750..000000000000 --- a/drivers/gpu/drm/msm/msm_drv.c