| Message ID | 20241105122838.0d6d94eb@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the amdgpu tree with the drm tree | expand |
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index ea2663169bf3,cbae2fc7b94e..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
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.