From patchwork Thu Jun 3 02:48:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12295985 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=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 A4C3CC4708F for ; Thu, 3 Jun 2021 02:48:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 208CF613E6 for ; Thu, 3 Jun 2021 02:48:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 208CF613E6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A41926EF33; Thu, 3 Jun 2021 02:48:56 +0000 (UTC) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 04AC16EF31; Thu, 3 Jun 2021 02:48:54 +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 4FwVhd4X4Dz9sPf; Thu, 3 Jun 2021 12:48:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1622688531; bh=xSLZDHrDrKxpk5ZtNpk55TJEoabwTu/1J5LjvK5s1ek=; h=Date:From:To:Cc:Subject:From; b=ksDH373YnNicstrzjVrgIeWBbmUjlWLgPI5tdeSo7Hq2BAvpHHstFlahBkdh6hvYe ydNO4G12THG7zcLA7SB1zXjHOtXEBIEiFzOpqpOrN+4J6c6HEwFUwo2XGpVClNryfY 4eoim1GFxtJdtFMzhdUh5uBX9vzPgs9rSPA9qUwthQ1oWqkNVDmkJ4IuL0m5O54p3c b2A5XCFZLykewwOFO3VEgFLyckKEjDJTrySQQY8qnseDy2VNM3v6M5IgI34iqcEudK FwjgJt1AnN5URfP84nkNIhLpfsTTh33vdLheUzhYQ6aNMnaCUYUB/YRNrc1nXbB4g1 QKexAv4j2lOtA== Date: Thu, 3 Jun 2021 12:48:47 +1000 From: Stephen Rothwell To: Alex Deucher , Daniel Vetter , Intel Graphics , DRI Message-ID: <20210603124847.19a6dacf@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felix Kuehling , Nirmoy Das , Linux Kernel Mailing List , Linux Next Mailing List , Alex Deucher , Christian =?utf-8?b?S8O2bmln?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the amdgpu tree got conflicts in: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c between commit: d3116756a710 ("drm/ttm: rename bo->mem and make it a pointer") from the drm-misc tree and commits: b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs") 2a675640bc2d ("drm/amdgpu: move shadow bo validation to VM code") 59276f056fb7 ("drm/amdgpu: switch to amdgpu_bo_vm for vm code") 19a1d9350be6 ("drm/amdgpu: flush gart changes after all BO recovery") from the amdgpu 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/amd/amdgpu/amdgpu_ttm.c index 663aa7d2e2ea,86259435803e..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index bcfd4a8d0288,1923f035713a..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c