From patchwork Wed Aug 14 03:20:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11093073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5FBEF14DB for ; Wed, 14 Aug 2019 03:20:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FB3E27F8E for ; Wed, 14 Aug 2019 03:20:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F2652851B; Wed, 14 Aug 2019 03:20:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C526B27F8E for ; Wed, 14 Aug 2019 03:20:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 012F56E144; Wed, 14 Aug 2019 03:20:57 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF89E6E144; Wed, 14 Aug 2019 03:20:55 +0000 (UTC) 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 467Zbn2WQBz9sDB; Wed, 14 Aug 2019 13:20:52 +1000 (AEST) Date: Wed, 14 Aug 2019 13:20:52 +1000 From: Stephen Rothwell To: Lucas Stach , Daniel Vetter , Intel Graphics , DRI Message-ID: <20190814132052.6a948fec@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1565752853; bh=aDsEWAk8z5cWPOG79P6XI4GbMTAPFisWuPLsGPIVZaE=; h=Date:From:To:Cc:Subject:From; b=OfvMgYDEoc5j4nmZxjhAiXUu8JURMocpVhHAxh5LYGPt5wh1xfDF4uSVU33HFFml/ bVD69r0O8Bj9PFG9LfVVbm2ZGeGlTML5crheGADIF91G1+F7REZsZ/ZQIPTWcSsJWB aSKlBGjcCWQu8MGD7Hu8H4YrAfCYZkBnIUWls7McriXALqsrGB1T219MJLqqnjcDSp ukd3JOX+9q01A3GpQf4H8hpgcjVDaaDR2PZU3w1oCRieSWnMiU8GNFvN2J6VLxGDih 02hJHfYeGvg8Eb9vt01OYf4wcYmbhCSuvy4RVyQXJpn7Wq9LFOIKBzUZ6Y/9bGA/m2 ve5tACyT+5GSA== Subject: [Intel-gfx] linux-next: manual merge of the etnaviv tree with the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Sam Ravnborg , Linux Kernel Mailing List , Christian =?utf-8?b?S8O2bmln?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the etnaviv tree got a conflict in: drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c between commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm-misc tree and commit: 6eae41fea750 ("drm/etnaviv: drop use of drmP.h") 2e737e520548 ("drm/etnaviv: clean up includes") from the etnaviv 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/etnaviv/etnaviv_gem_submit.c index 998c96b40d8a,f535a627f297..000000000000 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c