From mboxrd@z Thu Jan 1 00:00:00 1970 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.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 7674AC433DF for ; Fri, 16 Oct 2020 01:48:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5725A2078A for ; Fri, 16 Oct 2020 01:48:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="nlXlQP4b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389513AbgJPBst (ORCPT ); Thu, 15 Oct 2020 21:48:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389331AbgJPBst (ORCPT ); Thu, 15 Oct 2020 21:48:49 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F7FEC061755; Thu, 15 Oct 2020 18:48:44 -0700 (PDT) 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 4CC8FP0zkjz9sTK; Fri, 16 Oct 2020 12:48:41 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1602812921; bh=Bv8mW/Z5DDg0FU5ThZnGc9FK3ffvxVVTHJa3v2eHyYA=; h=Date:From:To:Cc:Subject:From; b=nlXlQP4bEQIFVveP2R4zhVUl+XH/Bh+QLW3vFMUNd7uOycEVyJBijG8UABRpEmfgt DbWbqlcLPSuYWylsOTi3yfWWj5J0zVEvdclLDEGBea0PbZTD2lyPp0B2mszjNARFRf S2e8lfxCSUmW9ccE+q4pR6Z5sFfDX4g9QBhOuD+oAKPloKHKlLUm7GJjSPn6pnWpPa xysmhIqRk/owH96XvUlL9ASzRFSNjLhbb9LNijScZ8Oa7ZBMhuEPDpRzngwCYqdCBN yYsJ4CWqqDtD/5harpPH3hcVWPP3d/7eZSgE/kpm8WfZVwLdLe60aUj+DYRnR8aDE0 OdjXmAAaj2Lsg== Date: Fri, 16 Oct 2020 12:48:38 +1100 From: Stephen Rothwell To: Alex Deucher Cc: Alex Deucher , Evan Quan , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the amdgpu tree with Linus' tree Message-ID: <20201016124838.4ff60cc0@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/LPfLcBmW6cQ0Etf_uyl.eNi"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/LPfLcBmW6cQ0Etf_uyl.eNi Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c between commit: 3cb9d2416ccd ("drm/amd/pm: setup APU dpm clock table in SMU HW initializa= tion") from Linus' tree and commit: 44d6e160f60a ("drm/amd/pm: setup APU dpm clock table in SMU HW initializa= tion") from the amdgpu tree. So this is one of the things that can go wrong when you have the same patch obn both sides of a merge ... due to the context not verying very much, the chunk of code that is moved into smu_smc_hw_setup() by these identical patches was inserted twice by the automatic git mrege resolution. I fixed it up (I removed the second copy of the code) 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. --=20 Cheers, Stephen Rothwell --Sig_/LPfLcBmW6cQ0Etf_uyl.eNi Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+I+/YACgkQAVBC80lX 0GwRxAf/b6gRvc7Fn6uxOaNiccloYNgx8JoYEp67S+87fjYdaf8LeR6anQ4slBHY sTNInM8ipazcVx+w6RheGCwpq1fx8atGiHVxQ0vGiIaK+4i9YdUUamKwUinAz31B ngh7Expln5/KAPhNOqdimp10hqeHxzTL26NuqmGx1338jrwfaveKbB3tpqaNcl/U jZATCNIJbPGf6cHmDI+3Rk3JKZBtH/Dg1uvtQadFnp8/BNHupNlo+ye+WC1/FjJ4 Bks0qTFj6hKDj5Wxx4JQSk0njkKILhVH0yeWOV04uK+/jldupiCNo75L9RPf6BH1 sQ+dbSA+AYKapoCiWFN3ZeVaGgi4KQ== =T7Z1 -----END PGP SIGNATURE----- --Sig_/LPfLcBmW6cQ0Etf_uyl.eNi--