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.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 D61BCC32750 for ; Wed, 14 Aug 2019 02:59:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB11F20843 for ; Wed, 14 Aug 2019 02:59:03 +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="nSnndy//" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727072AbfHNC7D (ORCPT ); Tue, 13 Aug 2019 22:59:03 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:58881 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbfHNC7D (ORCPT ); Tue, 13 Aug 2019 22:59:03 -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 467Z6X47RPz9sNC; Wed, 14 Aug 2019 12:59:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1565751540; bh=SgzxPbunzDlk0vpfnIGzHSvRfrYFy7BKMOSoNt6hY78=; h=Date:From:To:Cc:Subject:From; b=nSnndy//cBGZP8jBVBSIFbwmV7Gn1HN5JL5PypAOzNCHid8U+VnIA//omsbPx1DQS l3F/pGEqtNjeEEG578TqPF/OsRfpiuYY9HAHFNpvJ5+0XVJs9lWJHicyhF/sNJ37g5 g7+kWbJ2YqCTUa/QtvHKR9dnjgKrZGMvUegHdDh/NYJ193o7RYGtXORwAmlc/50rqs dDkgQMll4hcAZyTp4tOC6XtNp3J8o2enpkvlEeDAyGqBMJb5HW1I6GEtLxmvQXxpXE GR4k4aexxTjsriMwqOnFjoMBFbNdxvmqpN7eKyFIMzCFdHXQPD6HeBFjSabZesdDWu NdRBOSGP1nTew== Date: Wed, 14 Aug 2019 12:58:59 +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: linux-next: manual merge of the drm-msm tree with the drm tree Message-ID: <20190814125859.35c1a2ca@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/1g9vI2EL2+98FYn_39ozApq"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/1g9vI2EL2+98FYn_39ozApq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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. --=20 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 #include =20 - #include #include +#include + #include + #include =20 #include "msm_drv.h" #include "dpu_kms.h" --Sig_/1g9vI2EL2+98FYn_39ozApq Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1TePQACgkQAVBC80lX 0Gy6ugf/SAOlPu3E26OGnU9rpI4HyT3h0z1VyDFxQ5P5iN/PMZGNkAfq69NdN7aw cuGSakzv3jRC3SLZsXGYZh2pCKhXSdejXKrlhbS6sHzY3TCyDXbP/6oTU6zEp/F6 xysxVbbL8CzW0SHvL68v6uOn0rf26xDI5/WbCSomAZHrL+uGADBGXqsiHIQ4BOlQ uKo2GBpzbILrPralQvn5EXAJMqe22XgssjuT3cs9OpVdn+fR9/JzSbhlU/LRxAeE r0XvwwkCCj+NymuejiDpy27mmfvodQYEw+CHBHfKol70nYYo4aDl0rK6Uo5Uv18/ qIsGtQ26Ngb9bMUPWibdYoT8ZgzUsA== =F8Pt -----END PGP SIGNATURE----- --Sig_/1g9vI2EL2+98FYn_39ozApq--