Hi all,

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

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

between commit:

  7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")

from the drm tree and commit:

  887e8cec55f2 ("drm/amdgpu: set fb_modifiers_not_supported in vkms")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 09dec2561adf,500a1dc4fe02..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@@ -498,6 -498,10 +498,8 @@@ static int amdgpu_vkms_sw_init(void *ha
  	adev_to_drm(adev)->mode_config.preferred_depth = 24;
  	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
  
 -	adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;
 -
+ 	adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
+ 
  	r = amdgpu_display_modeset_create_props(adev);
  	if (r)
  		return r;