linux-next: manual merge of the drm tree with the drm-fixes tree

Mark Brown
2024-06-27T15:00:48Z

[-- Attachment #1: Type: text/plain, Size: 947 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c

between commit:

f6f49dda49db7 ("drm/amdgpu/atomfirmware: fix parsing of vram_info")

from the drm-fixes tree and commit:

9a55c77978308 ("drm/amdgpu: fix getting vram info for gfx12")

from the drm 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_atomfirmware.c
index 2e13c7c4b2b41,f932bec6e5345..0000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c

[-- Attachment #2: signature.asc --]