From patchwork Tue Nov 17 00:31:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11911083 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=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 58689C63777 for ; Tue, 17 Nov 2020 00:32:14 +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 63CBA238E6 for ; Tue, 17 Nov 2020 00:32:13 +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="cL4zmRA1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63CBA238E6 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 984976E0BA; Tue, 17 Nov 2020 00:32:12 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id B64606E0BA for ; Tue, 17 Nov 2020 00:32:10 +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 4CZn2B4JDGz9sRK; Tue, 17 Nov 2020 11:32:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1605573127; bh=V9ydg2LxEVWrqzBnw4r/Moz9ZtUWw12zFNoMCblPROw=; h=Date:From:To:Cc:Subject:From; b=cL4zmRA1ccuklJbyk5L34kIble7StjBtSt5a9+4IVX+tiAxZnyriyPJy5glAxGPvZ uzbIpwNeQUgXyqITQrr2RROUd4gfeHivduAx64GyF9YIai7/XlTTFmNss//EGPiR50 0iGKLNr4S480tKzVgau/4KzhJXHm/9kW/0fE98IIPDXXfAEL0mPHAeukroKd1kNK3E rerVuGswvb84VGd4M5YqPayo7ogZ5+4OTrHLEd04JNjt462kgF4bO2R0QMHzy1uIUR zoEjT2RFTW18JPtS0iCCsdydzywtk15tP4QDNlmvNI9cr+NdYa7t692d1DY3CLkZet Z1rwr5dftf03w== Date: Tue, 17 Nov 2020 11:31:59 +1100 From: Stephen Rothwell To: Alex Deucher , Dave Airlie Subject: linux-next: manual merge of the amdgpu tree with the drm tree Message-ID: <20201117113159.3574fbcf@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: Daniel Vetter , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Alex Deucher , Daniel Vetter , Lee Jones 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/radeon/radeon_drv.c between commit: 384bc5e059d4 ("drm/radeon: Stop changing the drm_driver struct") from the drm tree and commits: 4d3efadd374a ("drm/radeon/radeon: Move prototype into shared header") 0a2e8d51e4da ("drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared header") f3723ad110c5 ("drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype into shared header") 4138b62b8a79 ("drm/radeon/radeon_drv: Move 'radeon_gem_prime_import_sg_table()'s prototype to shared header") 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/radeon/radeon_drv.c index bfadb799d6a3,84f5d56528ee..000000000000 --- a/drivers/gpu/drm/radeon/radeon_drv.c