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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 17 Jul 2025 12:46:57 +1000

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)) {