[lkml]   [2022]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the drm tree with the drm-misc-fixes tree
Hi Stephen,

Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> 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.

Sorry for the noise, the patch "5e3f1e7729ec ("drm/amdgpu: fix start
calculation in amdgpu_vram_mgr_new")" and another one is going to be
reverted from the drm tree as well.

It's just that -fixes patches where faster than -next patches.



 \ /
  Last update: 2022-07-11 10:06    [W:0.291 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site