| Message ID | 20230726111018.6a023a7d@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_gem.c index 7da871972a8e,992dfd3de49c..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c between commit: 8a206685d36f ("drm/amdgpu: use drm_exec for GEM and CSA handling v2") from the drm tree and commit: 30953c4d000b ("drm/amdgpu: Fix style issues in amdgpu_gem.c") 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.