From patchwork Mon Feb 1 01:30:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12057869 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.5 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 1FED1C433E0 for ; Mon, 1 Feb 2021 01:30:22 +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 DFAC064E2A for ; Mon, 1 Feb 2021 01:30:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DFAC064E2A 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 BF9976E3B7; Mon, 1 Feb 2021 01:30:19 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53CFB6E3B7 for ; Mon, 1 Feb 2021 01:30:17 +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 4DTVkG4qY8z9sWK; Mon, 1 Feb 2021 12:30:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1612143015; bh=Wd/JJ/E6TrflMwIVwOUxitkADKWzVU0gMA6MHK+LKoI=; h=Date:From:To:Cc:Subject:From; b=pwXRPWqISOUS3l4PaZ2U4l+9Z5E/zgtZXxoOsDq1prt5fUjdJEyiMduyapjJONl5/ /JL3evWpY2HRpfiIe1Z8eRDC+7OXYp/al/4URgiB3XWSf4MzbI2W0Qgt/300aotrHa dj83ZiFQVsjIyHceKnHNzNNnZflKcSOejH47uqJGIC+Sn9Knzu2+bxZRKJbj8P7WEN mXAmMrvUvaIFGF7Mn1bicoewGK5Abie0m606WM2yeL8ulqCCHeBX3q4QpuJ0RKKhPO 8bGm5w1o/L3LuvH9+I3U6T+pSfyZU51uQ/XDixAhNBvQwHTUMNdYHKDE6DjARCdxK6 dxYFiqLYCXwXQ== Date: Mon, 1 Feb 2021 12:30:12 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20210201123012.139b3978@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: Alex Deucher , Linux Next Mailing List , Linux Kernel Mailing List , Ryan Taylor Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h between commit: a119f87b86bc ("Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)"") from Linus' tree and commit: d8a0b8dd690b ("drm/amd/pm: add pptable_funcs documentation (v3)") from the drm 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/pm/inc/amdgpu_smu.h index 0d797fa9f5cc,a087e00382e6..000000000000 --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h