From patchwork Wed Sep 20 01:12:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 142176 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3826899vqi; Tue, 19 Sep 2023 19:33:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqvp/VP7R3lgrNCXdCGr38qIGySnSxeecqfW33nrmzwgUt98u3J9+2yv5eEvNeDQguPcmG X-Received: by 2002:a17:90b:3e8e:b0:274:2f7e:782 with SMTP id rj14-20020a17090b3e8e00b002742f7e0782mr1358597pjb.7.1695177214236; Tue, 19 Sep 2023 19:33:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695177214; cv=none; d=google.com; s=arc-20160816; b=ShRSngYX0MNni2wDPlH57FLZn1egDjOUpNl8tPhq8CCOTLxcXa6u9G9Pvn6Z5M5wGb J+zAkZwK3DJKCnRdkE936DpwUmZUkDtY57PU5O9Jzcsoo692JNEEWpklcGvbso0WwNaO AR9BQZGZYRYv/Y9RdpRGbpoW/5HyukFcXXWuCY3WKv/QmzMmhF4c6Fw/BmOYJXTWN9wX YxMUtQB1sWFBYmakH4EEuh+H5ceWvEpTWBTqesQBw4nSHxH7f/s6oZ8Dpyp3ZMNOtRDC uiASE6KpoHHg14n3Vz6HvrJypw0KnMhKczrDkqZgFuUTtH/ZX/8cXDhsME/qnNQYgMhI zgDQ== 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=naroMBErSn2t3KbKYiTgYiGNYwV6PHYlOn96MGhMVbU=; fh=eG1t7V5Zo+lkhQEgZ3TbxqcLxo1r1gDJO+b6J10nZ3Y=; b=pXFrh8qZT0rd0TklUh42VS53HaFYq2Z1b6LYVA0tGWDGmOA9AOnHXhPjfvvt9VZbdE iBSCDiElKW+9AkUgTwD36VEQL4g0gsRV+roQSIwrGavIH1/YgqwHopGYWCr4xPfjp4UX Zoobyn//DwjnnZ7xKj+ukmBZuNimU7pzCKwhxKKWV3zx0JG5qZFveDMmBv5PqORUzXzE I5zYf8F8uVAanYZJ7bGhLZ2smZc4EunQkDCFnJ5QVU8XeH/x00L1YYjPVg65lx4X/phW ZbuUPEzTGwdrlU2SXfFzgz8h2pAzBt1y34ng5qlc7MRjvWcGCGuT90Wu5fE4kq1ql9xR HH8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=eQhvCkGQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id g8-20020a17090ace8800b0026b698fdda6si515204pju.98.2023.09.19.19.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 19:33:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=eQhvCkGQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id 21C808251710; Tue, 19 Sep 2023 18:12:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231174AbjITBM0 (ORCPT + 26 others); Tue, 19 Sep 2023 21:12:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229641AbjITBMY (ORCPT ); Tue, 19 Sep 2023 21:12:24 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5043B3; Tue, 19 Sep 2023 18:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695172332; bh=naroMBErSn2t3KbKYiTgYiGNYwV6PHYlOn96MGhMVbU=; h=Date:From:To:Cc:Subject:From; b=eQhvCkGQy6/Zb2WjeJo7Q0LxmIDUIvRrFY3Vv9TAIwmeq0MYlPuzrgfJffsVYAToE mU8tGlAN/uCQhcdWBDbg2hh8080qBybcRGIu9srJg8Mu/29jGnl9Qpv9iNKd34GgQF fbssHai6RLXbVsIb8eypLsQM2l1UQCheHX6a/wCcaWcTUbi2memdDNPwSWFV+7zI37 WAE3/gULCeuT2Pa5MBg6Orm61rPdfFo88ZLx8MukYpErYU+AqoojpCdAAVGE2zgY0a qXyRAZy7d4G+cnreP6M4soU9Yoa4ZSZ9Z9X6AblzWHOwg1PWzQydRTDh7S9cvuEoXZ kggzWQdIXTxag== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rr0qw0Fyhz4xGM; Wed, 20 Sep 2023 11:12:11 +1000 (AEST) Date: Wed, 20 Sep 2023 11:12:10 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Ben Skeggs , Karol Herbst , Linux Kernel Mailing List , Linux Next Mailing List , Lyude Paul Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20230920111210.505e5daa@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Tue, 19 Sep 2023 18:12:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777522142623027332 X-GMAIL-MSGID: 1777522142623027332 Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/nouveau/nouveau_connector.c between commit: 1b254b791d7b ("drm/nouveau/disp: fix use-after-free in error handling of nouveau_connector_create") from Linus' tree and commit: 8b7d92cad953 ("drm/nouveau/kms/nv50-: create connectors based on nvkm info") from the drm-misc tree. I fixed it up (I think, 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/nouveau/nouveau_connector.c index 79ea30aac31f,94498c15b50e..000000000000 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c