linux-next: manual merge of the amdgpu tree with the drm-misc tree

[Mark Brown]

Hi all,

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

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

between commit:

  6ccc5b5fc1d36 ("drm/fbdev: Move fbdev helpers into client library")

from the drm-misc tree and commit:

  51a4359f7431a ("drm/amdgpu: serialize vblank counter reads against GPU reset")

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.

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 51a7a4091376b,f34150d20a2f2..0000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@@ -28,8 -28,9 +28,9 @@@
  
  #include "amdgpu.h"
  #include <drm/amdgpu_drm.h>
 +#include <drm/clients/drm_fbdev_helper.h>
  #include <drm/drm_drv.h>
 -#include <drm/drm_fb_helper.h>
+ #include <drm/drm_vblank.h>
  #include "amdgpu_uvd.h"
  #include "amdgpu_vce.h"
  #include "atom.h"

Attachment: signature.asc
Description: PGP signature