From patchwork Fri May 21 01:38:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12271679 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,URIBL_BLOCKED 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 F019AC433B4 for ; Fri, 21 May 2021 01:38:32 +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 55D49611AE for ; Fri, 21 May 2021 01:38:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 55D49611AE 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 C0EBF6F59C; Fri, 21 May 2021 01:38:31 +0000 (UTC) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id B822A6F59D; Fri, 21 May 2021 01:38:30 +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 4FmTlS1Z85z9sV5; Fri, 21 May 2021 11:38:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1621561108; bh=4Fb+1sWp4AEVdRzTjOYK4Ft+EIzJhCyYWl/H051C5Ks=; h=Date:From:To:Cc:Subject:From; b=Lao+G0QQ2gwqnbik/zz+3IYRZ7vr6ocxWUHHa7JdDmIf79+x1YKQpG+TB82PDv7Yn LSvMJrCGKhfZFKfWD9y475LyDXIiqxPxZMQOVfH6aH0bIYEMu7LmrESnmx6ZB777UD WRw0K1XWJjXCIXBrKzfqgb+2UwfBqZnzhB6w/ntNSeqfkjn0/Nma/GDX2hoytGz+AB vCJjSm5pkZpRT53a3ez4lMEzSEUa1i4E0qKqsHzB/jUrYAia0H5vz899ufYVXmgpwi GjHJVf0Rh6WdxRlB+t/dm98K2xHoOyZ05StGV/nVZhBkelWx4DjFIVSKOiQcDT7o/x OIqeBol0YRYaA== Date: Fri, 21 May 2021 11:38:27 +1000 From: Stephen Rothwell To: Alex Deucher , Daniel Vetter , Intel Graphics , DRI Message-ID: <20210521113827.675898b8@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: Alex Deucher , Andrey Grodzovsky , Linux Next Mailing List , Christian =?utf-8?b?S8O2bmln?= , Linux Kernel Mailing List Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c between commit: 35bba8313b95 ("drm/amdgpu: Convert driver sysfs attributes to static attributes") from the drm-misc tree and commit: 589939d40116 ("drm/amdgpu: fix coding style and documentation in amdgpu_vram_mgr.c") 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_vram_mgr.c index a99d196b05df,a52e17ed3df6..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c