Subject: linux-next: manual merge of the drm-msm tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 14 Aug 2019 12:58:59 +1000

Hi all,

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

  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

between commit:

  e78ad7654179 ("drm/msm: Use drm_gem_fb_prepare_fb")

from the drm tree and commit:

  ddc73f32ba95 ("drm/msm: drop use of drmP.h")

from the drm-msm 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/msm/disp/dpu1/dpu_plane.c
index 8cf0b8a4ed03,cd6e9bb1fedf..000000000000
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@@ -10,9 -21,9 +10,10 @@@
  #include <linux/debugfs.h>
  #include <linux/dma-buf.h>
  
- #include <drm/drm_damage_helper.h>
  #include <drm/drm_atomic_uapi.h>
 +#include <drm/drm_gem_framebuffer_helper.h>
+ #include <drm/drm_damage_helper.h>
+ #include <drm/drm_file.h>
  
  #include "msm_drv.h"
  #include "dpu_kms.h"