From patchwork Sun Nov 5 22:48:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 161791 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2334150vqu; Sun, 5 Nov 2023 14:49:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGnAHdZYNdmF3aPv+TEKuvn3KV3F9SR/auk/+wi/W4WW8UpTW7oSgyg6Cdkob+Pub+JknEF X-Received: by 2002:a81:b50a:0:b0:583:d8d4:7dfe with SMTP id t10-20020a81b50a000000b00583d8d47dfemr8764499ywh.31.1699224557393; Sun, 05 Nov 2023 14:49:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699224557; cv=none; d=google.com; s=arc-20160816; b=wyoFgoRmppAASnisL95AHGV4lslkKfZXb1f5LTX3RtiuFnQlawAvt52lcCiyU5kf/u sqfwqhZd2F7TLzpluirrZ8D6YRd0KtbQ4RkUhTlONlZPiEW/AQIo27VhyF/SrD7Y0IrV 1ru36aeDt1XQHOJeL2vCu3WsSkRlLGdI4Dc8pHD11dCHRXq+Itwwb9xPAhEPGZpYJrwK uMo2uSl6mmuSBUGI6QtKh0ic4Jfh0wp+w7nbI348TD/ZUMNuga1liRnCvWjOyenNwhJR 3IYAoh6qvEV7z2i7agDUJ7ONiD2Igg9eq3uix7h+Ykoxk4UG79RgxrMjksySsbcfpwgX +Y3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=L6zHQsQltusScahnA+vWcv3kyj7CxopeqfK6s7GAgfo=; fh=41ay3oLzw/D7FCalBThIzBg3ExJ7iiO+0ad7ADYr3pE=; b=WRZX+uJQzKdG21mhS4CI0fT09M30FArXMAB7JamtCvOoNkBRSwmoJ4OKZFWBXETi+0 YJzEF9HM3Hsl9Z0KIE0VLLOp+gpCmH2zCBTBduPjK///hvkrzfwmTznoS6ohvIEQptqm 2KulwGZOe092mRnRAanBOHzSiQ1SiM+JrF69RYBEgfNJqoU/9lPgzElLQjPOj/X3wKOP nSKA0EevWdMYWGlKjzLFpMWO8sxNx7cB/C6ZOJamFNKMkujK6CWjfoaqUh8+pUTnn8zs YgRUdWC/xh5Py138FWYToaDy/KeeL6+qu8RBikNY/BulGduWE9gIk1WDtv6GJg2PoKgW SIIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=f95g484e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id g27-20020a63111b000000b005bd043711cbsi6295100pgl.216.2023.11.05.14.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 14:49:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=f95g484e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 3C5DE809F38C; Sun, 5 Nov 2023 14:49:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229854AbjKEWtC (ORCPT + 34 others); Sun, 5 Nov 2023 17:49:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229690AbjKEWtB (ORCPT ); Sun, 5 Nov 2023 17:49:01 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F33CCF; Sun, 5 Nov 2023 14:48:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1699224537; bh=L6zHQsQltusScahnA+vWcv3kyj7CxopeqfK6s7GAgfo=; h=Date:From:To:Cc:Subject:From; b=f95g484er1ViIFXecBQFbkbf7X+4I1RtUQ2OPHd6enfjQshGML8kLGI/WIbBYgE5V Ah1Kmbtoa7zTUpyfAk2aw571liN3PnFsjIUx3hFF/1aEcIqxujGmz/sPhNY8zv3ZCG r5i+hS8omEdDZOkIwdW3T5yBLuW7pZz/lwfw2i/zFUWCvDK8Q3f2B3rPaWTuy1OXI0 U6G4cwEIC0FaAGr4RSXDV0Qa1aaoOfbwil87t3mYKPDLr1zqnmw6lb5TsCQCo4f/oZ /D49j6K1dkik8oYEvi3Rr1iG00UC/uNUMH3EncQGCA8yhHV533f9MAQK5Zb+TYysbH 4a466f6KNJzNg== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SNqQw0Yxdz4xF5; Mon, 6 Nov 2023 09:48:56 +1100 (AEDT) Date: Mon, 6 Nov 2023 09:48:55 +1100 From: Stephen Rothwell To: Alex Deucher Cc: Alex Deucher , Bjorn Helgaas , Linux Kernel Mailing List , Linux Next Mailing List , Sui Jingfeng Subject: linux-next: manual merge of the amdgpu tree with Linus' tree Message-ID: <20231106094855.38376d52@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 05 Nov 2023 14:49:15 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781766089633185726 X-GMAIL-MSGID: 1781766089633185726 Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c between commit: 18bf400530ca ("drm/amdgpu: Use pci_get_base_class() to reduce duplicated code") from Linus' tree and commit: 432e664e7c98 ("drm/amdgpu: don't use ATRM for external devices") 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_bios.c index 5bbb23e102ba,f3a09ecb7699..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c