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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 595CEC4CECD for ; Sun, 15 Sep 2019 21:18:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E3122067D for ; Sun, 15 Sep 2019 21:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568582305; bh=HlzmU13cHfL7fRz7gE6pT2rdo9L2uiVKePcqvdYD8Gw=; h=Date:From:To:Cc:Subject:List-ID:From; b=mPNKEihyIBQ9MxW9i/bDA0MzwmR+pMdu8L+d8M0up9RjOyfBZbCOzorRd6zvpN2os XQTMjOKsgB1FhwHN56lUn03ywS1wrJY1ztb5j5cxf4BqODNY0A+YtUgBFPjOzJqaDw gSucPv2kUZsb5GyFg5d0R7uPDJh0X62G3v1TcJCY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728295AbfIOVSY (ORCPT ); Sun, 15 Sep 2019 17:18:24 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:36902 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725270AbfIOVSY (ORCPT ); Sun, 15 Sep 2019 17:18:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=D/Z/DXNZ/ZVcvc0jLU37vcbECmBAnSYgyR5Gc9IOvzA=; b=LwZp3BUvgprsHm2BIbc+p9Jjs 10cJCpaldCpKGLrnvqE+TW+71VDIrzIoqvk6/y9cWe8lXdt4qGDlsRwm5PbCXm2tZJ5pFb6+MHZnt DrNrJPafofm90sgUHeRxtU9ex9wTdMjxlqQvUd6UB3Ib4327PzCPnqFwHDwSROCe9u2OQ=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9buV-0001PF-0w; Sun, 15 Sep 2019 21:18:19 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 412E627415FF; Sun, 15 Sep 2019 22:18:18 +0100 (BST) Date: Sun, 15 Sep 2019 22:18:18 +0100 From: Mark Brown To: Vasily Khoruzhick , Qiang Yu , Christian =?iso-8859-1?Q?K=F6nig?= , Chris Wilson , Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20190915211818.GH4352@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ISKrrfpKsPiF35CV" Content-Disposition: inline X-Cookie: Man and wife make one fool. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --ISKrrfpKsPiF35CV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/lima/lima_gem.c between commit: 21670bd78a25001cf8e ("drm/lima: fix lima_gem_wait() return value") =66rom the drm-misc-fixes tree and commit: 52791eeec1d9f4a7e7f ("dma-buf: rename reservation_object to dma_resv") =66rom the drm 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. diff --cc drivers/gpu/drm/lima/lima_gem.c index b609dc030d6ca,ff3d9acc24fcf..0000000000000 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@@ -341,8 -341,8 +341,8 @@@ int lima_gem_wait(struct drm_file *file =20 timeout =3D drm_timeout_abs_to_jiffies(timeout_ns); =20 - ret =3D drm_gem_reservation_object_wait(file, handle, write, timeout); + ret =3D drm_gem_dma_resv_wait(file, handle, write, timeout); - if (ret =3D=3D 0) + if (ret =3D=3D -ETIME) ret =3D timeout ? -ETIMEDOUT : -EBUSY; =20 return ret; --ISKrrfpKsPiF35CV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl1+qpkACgkQJNaLcl1U h9BdyQf+NBR+OtiuVpJuBrAynzBaPQz4b6bfcATyxJIDwwtTqUsI4xcGXwnn+Tag FOfoQit1DM4gnslG1PodBwMU5ieaQXCTLNqZhCBXpG4QMAqaGt3KKzoODqAPYu/r X90diF77RxAKDFrqCXtl32zCVKc3J/HaP15P2lw5r7bEell5CRz9R0kMRCl8fBvk 0hwWoTPlvEkQmpZkxhv89/4CU0pNjOgrDF90QldzJ9AlXsc+E+Tk0uwcF0XG1VJp KdFEEUzCOiDWBUZJNeRySXCXbF41TN8yqHUJQjRCiSHnvOobLIebo7qWCh8oALHR hSRfz7GzhnIt8KzUiXAwm8CGfD+giw== =qRpR -----END PGP SIGNATURE----- --ISKrrfpKsPiF35CV--