From patchwork Fri May 21 01:42:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12271681 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=unavailable 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 90E4EC43462 for ; Fri, 21 May 2021 01:42:40 +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 087EA61246 for ; Fri, 21 May 2021 01:42:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 087EA61246 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 3C90E6F59F; Fri, 21 May 2021 01:42:39 +0000 (UTC) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F8DD6F59F; Fri, 21 May 2021 01:42: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 4FmTrD23Djz9sPf; Fri, 21 May 2021 11:42:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1621561356; bh=NBPy0katuLaiq6HfjHUfCP+UbzPEkChk6oOJ+Kv8W9Y=; h=Date:From:To:Cc:Subject:From; b=d4pGBhhzPoc7bV5S1aKKCJFZhh1xLKOEqKwGL7irZfseHPUFbLT802VtxwH/Tk0rp AN3krvv2i3IY/9ZdVu/6iwJ2LslJ/KU3v9l0I8aKkHVxavLHTLb8ia/Fkr9o9Am7ir uE5IDt0yf6+QpGDchDkD7S1ty0xsqI+HDwtRY8ujVTvSCflrwMvEhd37cReCWl7Lt9 iCI0ZWrhmNF/jyL1CqjtCK/93+b4LWtEe5o8fJ8inXCxdWnkTSdOBkN18r0K8susQ1 ix8ofMIJf/ESyyINauEmJDspTSdJyxPOP/3mUhpxFG+yalCGMVBYtIr4x8+IDCn8X/ iJIDKrEYZfL4g== Date: Fri, 21 May 2021 11:42:35 +1000 From: Stephen Rothwell To: Alex Deucher , Daniel Vetter , Intel Graphics , DRI Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree Message-ID: <20210521114235.1a93dc84@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: Philip Yang , Felix Kuehling , Linux Kernel Mailing List , Linux Next Mailing List , Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdkfd/kfd_device.c between commit: e9669fb78262 ("drm/amdgpu: Add early fini callback") from the drm-misc tree and commit: 814ab9930cfd ("drm/amdkfd: register HMM device private zone") 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/amdkfd/kfd_device.c index b066aa009b6f,80015e866498..000000000000 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c