linux-kernel - linux-next: manual merge of the amdgpu tree with the drm-misc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250717124657.3e56c86c@canb.auug.org.au>
Date: Thu, 17 Jul 2025 12:46:57 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alex Deucher <alexdeucher@...il.com>, Simona Vetter
 <simona.vetter@...ll.ch>
Cc: Alex Deucher <alexander.deucher@....com>, André Almeida
 <andrealmeid@...lia.com>, Intel Graphics <intel-gfx@...ts.freedesktop.org>,
 DRI <dri-devel@...ts.freedesktop.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree

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:

  667efb341917 ("drm/amdgpu: Fix lifetime of struct amdgpu_task_info after ring reset")

from the drm-misc tree and commit:

  77cc0da39c7c ("drm/amdgpu: track ring state associated with a fence")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index ec73cf3a9024,5cb7bf9420f7..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@@ -90,8 -90,8 +90,8 @@@ static enum drm_gpu_sched_stat amdgpu_j
  	struct amdgpu_ring *ring = to_amdgpu_ring(s_job->sched);
  	struct amdgpu_job *job = to_amdgpu_job(s_job);
  	struct drm_wedge_task_info *info = NULL;
- 	struct amdgpu_task_info *ti = NULL;
  	struct amdgpu_device *adev = ring->adev;
 -	struct amdgpu_task_info *ti;
++	struct amdgpu_task_info *ti = NULL;
  	int idx, r;
  
  	if (!drm_dev_enter(adev_to_drm(adev), &idx)) {

Content of type "application/pgp-signature" skipped