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

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


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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2022-07-11 04:48    [W:0.068 / U:1.632 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site