From patchwork Mon Nov 21 02:06:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 23511 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1351878wrr; Sun, 20 Nov 2022 18:19:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf6io/96C0282ATKnDJmObPpsYhgD7ROxjFN48uj7DmA4tp3R9Vc0Su7VXEwRFxLXWFdfxmp X-Received: by 2002:a17:906:a40c:b0:7ae:180e:9b53 with SMTP id l12-20020a170906a40c00b007ae180e9b53mr13829363ejz.206.1668997171013; Sun, 20 Nov 2022 18:19:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668997171; cv=none; d=google.com; s=arc-20160816; b=W3Uyvia1sXAzk/KE7Lo88inR3sIbPGjqad069NZrkQlU+q/D1g6Pcf8j07emn3FTGY by//1uNjFWkt3mjdUTlqndckS9aLjQxXJGEmGY/Ec0WeKFHWBUuW8SHCM+09hWa0vP7t Y+7a8DPyyoQrArnVM3jZZB0VjDjn/LI5Q1ZeSglwe4KNx1zsM8JWAiH10uoH2YOUwmma 0r75GzxfUjEq8JUa/Pm81/tSYkmdVGR9DYUxlI+zNpwu4BzYclb7p0up46NN/AIjRXV7 KLH/wqp8xb9sJYXoZTYDGWnJgqkF6M57uAzetuZcQIv/CxTraWJVXaYq1XKVeBKXiIM/ dwRQ== 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=1wBzHsAeVVrRJCJUDdbostIQLXeNLSDzuWh+o2GaUFQ=; b=yIBNemoWBhWjSfJiiUKS4G0aEYOyvwv4Z/TaxUey5Xfq6lBFtK28APhumVzj+wQBRa +yXRRhT5Zxn1d5PLJxgqkTNlqFlvIFD/Mftm49UtAhJqcm1yb+uAYfLefUCeXhuJY7XJ XeHACr5+YMOh6kq6M6R8prqEqelmRZjPW76pP+BWtVwQyoWDFVCQK2rSdZGC59/7Iyyw 5UsNYWvrvyP1oK5jQra+1cYZD3lDXIkUKDCIUuiRvc9gE52+nGqLjhCNlF20qp7Z0MZB jJNBe4QH+8aH881kuLttCKLmsI72Uuy7m75t4PyiA/b4Ga5EzMWzzLdx3orlcemsskr5 H2nA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=POoudHAD; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b10-20020a056402278a00b00461865aae72si7313534ede.219.2022.11.20.18.19.03; Sun, 20 Nov 2022 18:19:31 -0800 (PST) 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=POoudHAD; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229821AbiKUCGS (ORCPT + 99 others); Sun, 20 Nov 2022 21:06:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbiKUCGQ (ORCPT ); Sun, 20 Nov 2022 21:06:16 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADF2815728; Sun, 20 Nov 2022 18:06:15 -0800 (PST) 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 4NFrN03jyNz4x1D; Mon, 21 Nov 2022 13:06:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668996370; bh=1wBzHsAeVVrRJCJUDdbostIQLXeNLSDzuWh+o2GaUFQ=; h=Date:From:To:Cc:Subject:From; b=POoudHADR+ufkAmTrmN8ykUtKQDiFobuXdcLdlm+hqat92AIIujHtGHslHl70frZ/ 2BHjLTIYAlnh3gxJMhA87h4TyGbZVGguaxpCqKKqv9rHQdSfEi1ZQUmxItKGu6x1c7 PTE/1l5bZMwpKCRO7N1GN0hkVHcT5R2gqAw8G9alfyeCr8poaDFY337FKzyMPUMW66 bofINZflrVycZwiCmQshRceHYZkArShpDawr5tn7gfzyxpTtQwM6jFzNpayH6vzUKl A6NHI4SL9YbO63MB6vbZh/4bheC1I2FZnMpAObDuFR3p3S3+Ri/Bs2VNFFqmxYtGx+ 5zpSiAm0YTqJQ== Date: Mon, 21 Nov 2022 13:06:07 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Cc: Intel Graphics , DRI , Christian =?utf-8?b?S8O2bmln?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20221121130607.78449b87@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 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?1750070377540494157?= X-GMAIL-MSGID: =?utf-8?q?1750070377540494157?= Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_job.c between commit: b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID") from the drm-misc-fixes tree and commits: c5093cddf56b ("drm/amdgpu: drop the fence argument from amdgpu_vmid_grab") 940ca22b7ea9 ("drm/amdgpu: drop amdgpu_sync from amdgpu_vmid_grab v2") 1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS") 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") 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_job.c index abb99cff8b4b,032651a655f0..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c