From patchwork Wed Aug 26 00:18:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11737019 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E897D138A for ; Wed, 26 Aug 2020 00:19:05 +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 C737620738 for ; Wed, 26 Aug 2020 00:19:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="NS2gmW2B" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C737620738 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=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 760886E9D1; Wed, 26 Aug 2020 00:19:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6357B6E9CE; Wed, 26 Aug 2020 00:18:58 +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 4BbmgM1tBkz9sTS; Wed, 26 Aug 2020 10:18:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1598401136; bh=tJVsIHj3u8pdSw38FTMaRa/EF/oKBc71jDbiOCWeoJk=; h=Date:From:To:Cc:Subject:From; b=NS2gmW2BL/p44MaUi2rdYGMc8fdMUvSP99HWSejz+Ckq2/c0d1Jbmwbm1y4BNV/ST sYOBsvro7GFWS/rXeuoXWx5WBq3abQg6XouW3vJfypa9FnJumV5ViDxdAMrGMnUo0A s8C4PGrBuJz/hxAWz4qgZsK/HjKbW8yO9ac6+MyInlwNRvfntr0536Gclb/v5CLlc9 wrlfKEwfgmpb+wZFoyRVL7mi4oJMdSvNfmcNwnMwVELfXZIYIkojp8l06Z63P93UkY sYD44wt7Vx5Xnv4hzitv4OodYH2gV78X0geltDzAx/+nbf9KA5syQPDcazpbfwYo7h fvgXKCkSuw4zw== Date: Wed, 26 Aug 2020 10:18:53 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Alex Deucher Subject: linux-next: manual merge of the drm-misc tree with the amdgpu tree Message-ID: <20200826101853.59136e16@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luben Tuikov , Linux Next Mailing List , Linux Kernel Mailing List , Dave Airlie Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c between commits: cacbbe7c0065 ("drm/amdgpu: move stolen memory from gmc to mman") 72de33f8f7ba ("drm/amdgpu: move IP discovery data to mman") 87ded5caeec3 ("drm/amdgpu: move vram usage by vbios to mman (v2)") 1348969ab68c ("drm/amdgpu: drm_device to amdgpu_device by inline-f (v2)") from the amdgpu tree and commits: 6c28aed6e5b7 ("drm/amdgfx/ttm: use wrapper to get ttm memory managers") 9de59bc20149 ("drm/ttm: rename ttm_mem_type_manager -> ttm_resource_manager.") 4f297b9c82e1 ("drm/amdgpu/ttm: move vram/gtt mgr allocations to mman.") 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/amd/amdgpu/amdgpu_gtt_mgr.c index e1b66898cb76,697bc2c6fdb2..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 63e541409549,fc5f7ac53d0a..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h index de37ceff0e56,7ba2be37e6ba..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c index 91098a385ed6,7574be6cd7a0..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c