From patchwork Wed Aug 7 03:09:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11080939 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 CE92A912 for ; Wed, 7 Aug 2019 03:09:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA2BA20499 for ; Wed, 7 Aug 2019 03:09:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB6BC28793; Wed, 7 Aug 2019 03:09:41 +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 4F90420499 for ; Wed, 7 Aug 2019 03:09:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C6EF6E5DE; Wed, 7 Aug 2019 03:09:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 12B0A6E5DE; Wed, 7 Aug 2019 03:09:38 +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 463Ggz26B2z9sDB; Wed, 7 Aug 2019 13:09:34 +1000 (AEST) Date: Wed, 7 Aug 2019 13:09:33 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Alex Deucher Message-ID: <20190807130933.5491b647@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=1565147376; bh=hciMHCev9cGV0CU2CP0dmB9i++aefUkurPOQYyCCfQE=; h=Date:From:To:Cc:Subject:From; b=iVKjA1ZefpsAbshM9XdGUWDwHfmyOJk3pHRAdO+CCNvk4kDDIsjO/t+0VbOSPWjbL e2hNF9/G3QtaK2l7T6LgseALRBgGPGB/VFzOzEPThg9RRyauhGDRpCEkfD2lx6VZ87 GJVN8hiwvSN4JIsUA6oGGBw2YkgJcKwafEqFGMcKngbQXV6cF5lhj560n1J0q5hN5Z Itz0PyihNa9/rl0tTua/zLZomWCjYqIETv1KE+wePT/HVTYPBpOmjGwcQVLHz18EV4 F191H9RHBC5xRpShbLdPi7qGTC11Oq6d9YXtGa6dBnL09rpRyCKV0zh5kiwr7WezbV nVKvqWEG4s37A== Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the amdgpu 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: Felix Kuehling , Linux Next Mailing List , Linux Kernel Mailing List , Gerd Hoffmann 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 drm-misc tree got a conflict in: drivers/gpu/drm/ttm/ttm_bo.c between commit: 274840e54422 ("drm/ttm: Add release_notify callback to ttm_bo_driver") from the amdgpu tree and commit: b96f3e7c8069 ("drm/ttm: use gem vma_node") from the drm-misc 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/ttm/ttm_bo.c index 2070e8a57ed8,10a861a1690c..000000000000 --- a/drivers/gpu/drm/ttm/ttm_bo.c