From patchwork Tue Nov 5 01:28:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13862248 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 99D5BD1CA13 for ; Tue, 5 Nov 2024 01:28:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B602610E157; Tue, 5 Nov 2024 01:28:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="VHDXD2pr"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 952FB10E157 for ; Tue, 5 Nov 2024 01:28:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1730770117; bh=2ydqDCJfAjTtRMwJu/mQEQxyknSlntFKqHzTV922HGY=; h=Date:From:To:Cc:Subject:From; b=VHDXD2prYvHJgPnsosEFKbXN3LOAiXXc5QHEpEOPOQ8TcBS7u5TOXJlGdFMgpcTcY IyB6RFz65R6htaYjxmtb3peh3XuDdWyQAGY2Tc7JheXAuSI+gG70A4kKSGERuM0k87 kvR0cItdrz7BLN8I+Yi0Z53QfdOCsFclO9QAokVybbW1Rvx0ATLPxKZ+ZOXJcecaNe dU+GE94deNxTOU4MqhVSkzTEOVvDhwggbkkb54qSEO14q/ZgmhSzokGZRuPSycJVed xidPgXiWegIudT7T8C/rJSFdE7ZvBkXyUTOCu7j8bKstUHWoyfdEo0AKBPA6/Kr3/C SoHBqTNPqakeQ== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Xj9hj1PPLz4w2N; Tue, 5 Nov 2024 12:28:37 +1100 (AEDT) Date: Tue, 5 Nov 2024 12:28:38 +1100 From: Stephen Rothwell To: Alex Deucher , Dave Airlie Cc: Alex Deucher , Christian =?utf-8?b?S8O2bmln?= , Christian =?utf-8?b?S8O2bmln?= , Jesse Zhang , DRI , Linux Kernel Mailing List , Linux Next Mailing List , Vitaly Prosyak Subject: linux-next: manual merge of the amdgpu tree with the drm tree Message-ID: <20241105122838.0d6d94eb@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: , 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 commit: b2ef808786d9 ("drm/sched: add optional errno to drm_sched_start()") from the drm tree and commit: 35984fd4a093 ("drm/amdgpu: add ring reset messages") 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 ea2663169bf3,cbae2fc7b94e..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c