From patchwork Tue Nov 22 01:28:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13051786 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BC22DC4332F for ; Tue, 22 Nov 2022 01:29:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0936310E1D8; Tue, 22 Nov 2022 01:29:04 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7099610E1D8 for ; Tue, 22 Nov 2022 01:29:00 +0000 (UTC) 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 4NGRVZ3Nzsz4xGK; Tue, 22 Nov 2022 12:28:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669080535; bh=r3Zq9zUP7eX1Hv56Y96Fbj75FRnDNCrFb/0crgzsSjE=; h=Date:From:To:Cc:Subject:From; b=ubAVMvdBvdfQKmzNayTxaIXvNdbm3RNy/BzJ4K62wszd/FAHKru/sdHvZ6qDAxD+K Ch+Hlp1t+RVGRT6fqZmp4kj02njXynLoKGis4Zq+JaI/yd2nF7UxVINAnKU9nQ3l3W qz6NJ3po/bkyotVTntTWCeQN1FUtgM06cB5Ep9DneDAZXzcMhe+l4bnv9ADVIANBO+ U2zaTaeAlHw2LJHdnlF6N4wDYtASgo/ai/5IaoqlpwbOJb34KzQohsVaSMx8rEbwog +aLBa65/8I9+CceKzVxX8N2D9dQg711NDHvrAm3fKSu5zzWX+0WUNkCCUyshMZAebo lPZPFd74XcVuw== Date: Tue, 22 Nov 2022 12:28:50 +1100 From: Stephen Rothwell To: Alex Deucher , Dave Airlie Subject: linux-next: manual merge of the amdgpu tree with the drm tree Message-ID: <20221122122850.3cd9657a@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Kernel Mailing List , DRI , Linux Next Mailing List , "Stanley.Yang" , Alex Deucher , Christian =?utf-8?b?S8O2bmln?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_job.c between commits: 1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS") 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") from the drm tree and commit: a61bf2f7299a ("drm/amdgpu: fix use-after-free during gpu recovery") from the amdgpu 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 ffaac1c21c91,f4a3122352de..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c