From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the drm-msm tree with the drm tree
Date: Wed, 14 Aug 2019 13:01:52 +1000
Message-ID: <20190814130152.129e86d1@canb.auug.org.au>
References: <20190814125859.35c1a2ca@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/9=kbS_Ym36rpqk1vELFy8bT";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20190814125859.35c1a2ca@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Rob Clark <robdclark@gmail.com>, Sean Paul <seanpaul@chromium.org>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Sam Ravnborg <sam@ravnborg.org>, Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: dri-devel@lists.freedesktop.org

--Sig_/9=kbS_Ym36rpqk1vELFy8bT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 14 Aug 2019 12:58:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the drm-msm tree got a conflict in:
>=20
>   drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
>=20
> between commit:
>=20
>   e78ad7654179 ("drm/msm: Use drm_gem_fb_prepare_fb")
>=20
> from the drm tree and commit:
>=20
>   ddc73f32ba95 ("drm/msm: drop use of drmP.h")
>=20
> from the drm-msm tree.
>=20
> 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.
>=20
> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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>
>  =20
> - #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>
>  =20
>   #include "msm_drv.h"
>   #include "dpu_kms.h"

Also in file

  drivers/gpu/drm/msm/msm_atomic.c

with resolution:

diff --cc drivers/gpu/drm/msm/msm_atomic.c
index 169d5f915e68,20387be1b810..000000000000
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@@ -5,7 -4,19 +5,8 @@@
   */
 =20
  #include <drm/drm_atomic_uapi.h>
 +#include <drm/drm_gem_framebuffer_helper.h>
+ #include <drm/drm_vblank.h>
 =20
  #include "msm_drv.h"
  #include "msm_gem.h"

--=20
Cheers,
Stephen Rothwell

--Sig_/9=kbS_Ym36rpqk1vELFy8bT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1TeaAACgkQAVBC80lX
0Gxg1Af9Eln97X1hb3IR2+fovPLB9B/4rRWFj5o0IcDHMXxKIwUTQp2ZyLdffrPm
zJG3JnZpeRUFGxJvxfHLaF7X9KDXLbe0usEOOUsPWX6jsbLQ2lljojRyNabLkvk4
tET+s+5pz9V41QGtDp7i1SjxY6Zi62OsCqmhbMTJeZ6OjcyR/RAZYyRJP9Qa1WZ4
h7BkzR97EUdqvDgb6D4VQqzvcJdF52aXlSBLILDOBkD1D/vD/Zooz3JOT667ZSSY
w0B1r1xp2P4bcqQdZGrfPPnlbr1pcK30+gveJ7WjMm78c5GJQRjAqBgUiQKOBXeX
gva/XLahskhdSDZ3LTG4d5s2BbxT3w==
=qNqU
-----END PGP SIGNATURE-----

--Sig_/9=kbS_Ym36rpqk1vELFy8bT--