linux-next: manual merge of the drm tree with the drm-misc-fixes tree
From: Stephen Rothwell
Date: Sun Jul 10 2022 - 22:48:16 EST
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
between commit:
925b6e59138c ("Revert "drm/amdgpu: add drm buddy support to amdgpu"")
from the drm-misc-fixes tree and commit:
5e3f1e7729ec ("drm/amdgpu: fix start calculation in amdgpu_vram_mgr_new")
from the drm tree.
This is a mess :-( I have just reverted the above revert before mergin
the drm tree for today, please fix it up.
--
Cheers,
Stephen Rothwell
Attachment:
pgpJ3IrW3d4i2.pgp
Description: OpenPGP digital signature