From patchwork Mon Jun 19 01:17:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 109705 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2724454vqr; Sun, 18 Jun 2023 18:49:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6NbKG/elgvY9OtSOLdXvYSRTIkWPwQgYpUEmrqv/DcefQ9IzHTBfjUpNUAatEYu6HGs8XF X-Received: by 2002:a05:6a21:32a7:b0:121:62fd:61ea with SMTP id yt39-20020a056a2132a700b0012162fd61eamr894638pzb.24.1687139379501; Sun, 18 Jun 2023 18:49:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687139379; cv=none; d=google.com; s=arc-20160816; b=YzSChWGDCwf5OkDwzC6qnYeBEY1WXpRSsY9W3ng4iOIjfloHbDv+Zoy3Is5+3lPHNg GFyfjFS+k2nWJ3mNb6hz//RVl9uoVTIt3o5IvzAkvFF2gK1oQRq7zcsc+NOrYVtivrfK jW6UaSjayvZGry/1Wv1Q4LE334p5cE9K4lQhE+Ed56ffCWaGtkZEt1TgCXwIoI0nGpVC I1Mrfe4qH9qHX5uPanQ+xfd6RXr86nogCV4jCbiwFAbNPdysiefc7qoBXeS0Vuk15JNj h65Zjyj5gWHKgM3v8DZ/rh/8fmmrKJNwEbdEhZiE/P8qy14sGE7Jo5v1fElmX4lHgT21 Xcdg== 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=3GkgCEb+I0Mdl4Zdw8oQq3JXp496a5S+tCyi6fFcyEE=; b=WygvVedpUmbzmN5shE1Vcu5r/f94xEklrqkMFLMNvytazcE2ccHhWhOpGze7fj6cQX qaGsD0xONoKHGFYHSU8ehqA355A0WCghMkjXDof53JC6LqzMh+HmP9CjpKCmYE2scs6Q XwukWxT9O6IEaZoL+HNKN6/bPa0REVXV/j3IDbQcK1lLc/gj4b+qNtju8MGbdM6ZTyKI CLE+yVidgT3NYKZA9NyDwqQGLhyQVK9ivBI1/ktrAK/5ZHqoCWQAXPbjHlwEed/XxC2W gnt+ZiLOr9f+IjJk+UpZWrhxh//lM7mFhwjboHB4r8VEX4M+RZfPygyfwK1cPu4DydnC jTGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=eOBZJ5LJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u2-20020a170902e80200b001a6e719421asi1840635plg.366.2023.06.18.18.49.25; Sun, 18 Jun 2023 18:49:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=eOBZJ5LJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbjFSBSE (ORCPT + 99 others); Sun, 18 Jun 2023 21:18:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjFSBSB (ORCPT ); Sun, 18 Jun 2023 21:18:01 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DED61B4; Sun, 18 Jun 2023 18:18:00 -0700 (PDT) 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 4QksMT5PTjz4x0B; Mon, 19 Jun 2023 11:17:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687137478; bh=3GkgCEb+I0Mdl4Zdw8oQq3JXp496a5S+tCyi6fFcyEE=; h=Date:From:To:Cc:Subject:From; b=eOBZJ5LJIVq1z65Qm9w/Rq1cPme57oMCPkwhzfW5r0YQqJkBVbpzmWns4FSYJBUbh julOp30RTo4F5KjopvWwZ7YSeRhBgaX2QFdlimCTQY4TVJB5Nszc+F3ThHDSkR/EvL P1ZaxxEfxI+WkHOei2/vLT5iuwhGShhWcPba3oXoK+yumIqpfkwdmdD+xlGQz4octd wJpArpy0aIFlUuVq5u8JXRp1LYSo+3IoanEdhBORX51digpEFwSiNnbAH11z1RMO4K Hr84NMxnCn10zzuVlqakQDXMYFwXK4okzmwb48EDyAXV1p7VLCL+3mLUnjnMY7XqXv FeZ84TuQMxEgw== Date: Mon, 19 Jun 2023 11:17:56 +1000 From: Stephen Rothwell To: Dave Airlie Cc: DRI , Alex Deucher , Arunpravin Paneer Selvam , Linux Kernel Mailing List , Linux Next Mailing List , Philip Yang Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20230619111756.452d0129@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769093862200201427?= X-GMAIL-MSGID: =?utf-8?q?1769093862200201427?= Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_object.c between commit: 34e5a54327dc ("Revert "drm/amdgpu: remove TOPDOWN flags when allocating VRAM in large bar system"") from Linus' tree and commit: 7f6db89418f9 ("drm/amdgpu: dGPU mode placement support memory partition") 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/amd/amdgpu/amdgpu_object.c index a70103ac0026,f76649e523a0..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c