From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A184DC32753 for ; Wed, 14 Aug 2019 03:01:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 794812064A for ; Wed, 14 Aug 2019 03:01:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="VJ9t/yRq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727377AbfHNDB4 (ORCPT ); Tue, 13 Aug 2019 23:01:56 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:45991 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbfHNDB4 (ORCPT ); Tue, 13 Aug 2019 23:01:56 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 467Z9s0Lz5z9sNp; Wed, 14 Aug 2019 13:01:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1565751713; bh=G7TA1FgQY5xyFwXvPhiSM4ybVZ5VkU9A/oH3axymBjk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=VJ9t/yRqnX1Peo7B0l9n9i2kfHKghZGAO4cn1u8h7JxPUzX/GB5OWuBcrZNVMKRal lStDPU/9gniEt0Jy4Dib0AHKqKzXWkuWiXIDEn4dfnoB4mbdVS0qWOoApqK6EdaKsG FrjCismGfiKWdMpnO4PKo4GR2p8ooM84qlp4+A03XmEcE+47sOK653UsEEwp0e6dfw 4fvanpBrPXd9AUbtrwwJySZN46y/eFwRFAXrJQzWVMjxMyUQ7fOSm/0osgQFk1g9WQ ts8MCyIDhbh3TKMtqEYL4s1+n/VJHMS4v/GXMuwvABiqna+46BmqQ3v5JEZ1X9jzRJ NWrDUMjyekc3w== Date: Wed, 14 Aug 2019 13:01:52 +1000 From: Stephen Rothwell To: Rob Clark , Sean Paul , Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Sam Ravnborg , Daniel Vetter Subject: Re: linux-next: manual merge of the drm-msm tree with the drm tree Message-ID: <20190814130152.129e86d1@canb.auug.org.au> In-Reply-To: <20190814125859.35c1a2ca@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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 = 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 > #include > =20 > - #include > #include > +#include > + #include > + #include > =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 +#include + #include =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--