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=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 B8EFDC388F7 for ; Thu, 5 Nov 2020 01:12:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63639206E3 for ; Thu, 5 Nov 2020 01:12:16 +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="MMBFxumT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388207AbgKEBMP (ORCPT ); Wed, 4 Nov 2020 20:12:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732131AbgKEBMO (ORCPT ); Wed, 4 Nov 2020 20:12:14 -0500 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6454DC0613CF; Wed, 4 Nov 2020 17:12:14 -0800 (PST) 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 4CRQV36PYdz9sTK; Thu, 5 Nov 2020 12:12:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1604538732; bh=VAlFI4XMN6eTaAbjjjkOrxdNBpK/KCzOLmOXnS2QvBk=; h=Date:From:To:Cc:Subject:From; b=MMBFxumTrIHj20xbLZbDa3UmnxiFgqQn3xK5K8668IkhPMQxcrr07aSWqyqyiAWiQ mD131Ul2PNPrdSifA25eXK7S8Aidf19UgVpaE5xYCPIRjghb8+P34iRmr2HwcqEGuF XO0QZy3Fumg+fsomX3t0qaSmLrG9KYifzXUpZZ0KYk9mpMqfL5RPwek9ByV+Lj1Y2o LbVWqxcLpbFXHaIU24aQdq+9DBRhhfZqDMrMo5h2pIYYxaWVQ7XPkH8tkjQ3iiDzmf +xrSqNV4onjs0QO5bDIDmZ6N50dbIFyGu2jhPZvww/TcJ7ikIR2HZYpazFA1gAKyHF rGyxgAnWhzrzw== Date: Thu, 5 Nov 2020 12:12:11 +1100 From: Stephen Rothwell To: Rob Clark , Sean Paul , Dave Airlie , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Rob Clark , Thomas Zimmermann Subject: linux-next: manual merge of the drm-msm tree with the drm tree Message-ID: <20201105121211.0342302f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/HKw2_5wHhMEYNQRMrIWYit1"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/HKw2_5wHhMEYNQRMrIWYit1 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/msm_drv.h between commit: 3c9edd9c85f5 ("drm/msm: Introduce GEM object funcs") from the drm tree and commit: 8f642378bfe5 ("drm/msm/gem: Move prototypes to msm_gem.h") from the drm-msm tree. I fixed it up (I used the former version of this flie and added the following fix patch) 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. From: Stephen Rothwell Date: Thu, 5 Nov 2020 12:10:23 +1100 Subject: [PATCH] drm/msm/gem: fix up for "drm/msm: Introduce GEM object fun= cs" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/msm/msm_gem.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index d79e7019cc88..9c422af6dd49 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -94,7 +94,6 @@ struct msm_gem_object { int msm_gem_mmap_obj(struct drm_gem_object *obj, struct vm_area_struct *vma); int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma); -vm_fault_t msm_gem_fault(struct vm_fault *vmf); uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj); int msm_gem_get_iova(struct drm_gem_object *obj, struct msm_gem_address_space *aspace, uint64_t *iova); --=20 2.28.0 --=20 Cheers, Stephen Rothwell --Sig_/HKw2_5wHhMEYNQRMrIWYit1 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+jUWsACgkQAVBC80lX 0GwljwgAgw+7BqWWL4s+lxlnRO5JkJ0kfD5PZczl0mjQsZjICkodrG48KQiBwyBe PH0Y+CY/+TrdT1kB1F/tMMsgrLvhcT8w3K6qdN0iIozM1WPvM4my5Qs7mYPtGSwH nV/dwgvSCC5uQ5QN6oHimHVYYa6qMNusyHZXrWQz0m5gDjoPNvhC6UkERLaeZfQL QhqK11jPUI7PN37Wa+GWtfAVFmL5bqvBUfJkH+4ERSLnCNL2tlNvYC/47/Zbv/cR 7lYvlhnLtK8iaEgnFLdKNY3NnD8+NhoSCdxp5rK3I7Ud09+Y29t9qMTpzCwbnGpE fh6pcm7JVax67YvTRFgtqU1k+X0HCQ== =DGF6 -----END PGP SIGNATURE----- --Sig_/HKw2_5wHhMEYNQRMrIWYit1--