From patchwork Mon Oct 9 02:47:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 149813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1621079vqo; Sun, 8 Oct 2023 19:47:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFO6FNbMIk3GoShKXKsW0WVN3ZQuzRTUXfH3QFro+ZZyPqBnDPmYgyPu0kYhhAnSJTcO9fM X-Received: by 2002:a05:6870:6392:b0:1dc:cd20:1e48 with SMTP id t18-20020a056870639200b001dccd201e48mr18153387oap.17.1696819651514; Sun, 08 Oct 2023 19:47:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696819651; cv=none; d=google.com; s=arc-20160816; b=X2kniraR+7jBczqsd2o5jupBvIdNGvAyllf0vJL7DL0+63BmXjpW06QCB4Kzx97noj mgpLBe5r3gMUjfIeKxqt/KxfBItcF3FjVwSYG4fdg3xHbICtdNvGKWy7BSDyed6hd/VH XmRyr6io5LXTCg5m2TMRCarwytZmkNUNsMxwP9aEEsOoWZxO4po+RumbF9czb89AxJRe ZuxKR0Yher064FHaNAvf8wuW0yN1IIWfFqaG1NQyJbJ0VDVnEbMJZwmC39dYjwHh5vY+ nCOm/5ftxDDc4BXZg0v0EfsV26RIRRrtE8cTZ0VmmBA+lv52Bx7L9zqP50YOCddsWwza gR/A== 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=uAjQtozBaePXZ1td6c6A6uLg10Aec3ih9uhNvEBYF+E=; fh=Rnxl7Z9zwCVQrp7fJ8B7AjGWcrDwwHtOiHrPolLVS1U=; b=gv/aUslhCOl3dflE0yLZKCTjy99bFsnwpEWyxXQP0oPC+8fZxqT7TAW5n5RMMe+XPW NDn/Q+3Xl4ksw2uYp2rpMgsKbQfx8Cu5u6HRpiLOm2ulBAZLBhOUZn0nOLc9i/kF4TpT Gn2f+gFCjTOSj9BC2kqSJK/IzWYR+oU/CmwYKVVh3yUUwgPAknLSkErc5o0trymRTdPz mbm39cNKiDlkBHyB6tpLS4YJE8aHNrPnvU3a1GDbDMTtXANya7Y02hY6oYxekyc/E8ff L8tsEz3DrbUVE93C8R9zzSQXTX0QOKDSa7psPry6Fc5FCPOm0U6TMMgELY9dVHJ6qALo bMXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=bjRXJyn0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id bw21-20020a056a00409500b00690f8ed35dbsi6381735pfb.345.2023.10.08.19.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 19:47:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=bjRXJyn0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id E60CD80697F9; Sun, 8 Oct 2023 19:47:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345027AbjJICrN (ORCPT + 19 others); Sun, 8 Oct 2023 22:47:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232250AbjJICrM (ORCPT ); Sun, 8 Oct 2023 22:47:12 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B6E6A4; Sun, 8 Oct 2023 19:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696819624; bh=uAjQtozBaePXZ1td6c6A6uLg10Aec3ih9uhNvEBYF+E=; h=Date:From:To:Cc:Subject:From; b=bjRXJyn07jgHYigYoMEJkq9TmTol8hKRyarJd77UoPVu35biv/NHXTWiSyVIvlnw4 eeIg4G3Nn9yvMjHICCchYPXcCdBFdZyDtucgdTUoh5DCCRmoZrFNQxAwzspnvK6/1L oF+P/6ZH/M6VLKZ1tauH+8mtfHZ0R/7UsgNSMfoyuqkDrrBvivWX6f7w6Mm68u3sCH U2f13NcvwEQilUXlPGUiJZSwD2fqwU8HINTTTC1YsB47glQX62cklGXOPt6flYLL1P WoockzU74nHkXmNfdJI7PU4skzwR86DH2a8ENktLt5aBLV5mf9+vqxF/eLIiNNgy8k fHEXG9UfmxDMw== 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 4S3k2Z4kHRz4xPc; Mon, 9 Oct 2023 13:47:02 +1100 (AEDT) Date: Mon, 9 Oct 2023 13:47:01 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Bjorn Helgaas , Lorenzo Pieralisi , Krzysztof =?utf-8?q?Wilczy=C5=84?= =?utf-8?q?ski?= Cc: Ingo Molnar , Linux Kernel Mailing List , Linux Next Mailing List , Muralidhara M K , Suma Hegde , Vicki Pfau Subject: linux-next: manual merge of the tip tree with the pci tree Message-ID: <20231009134701.17ab655e@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Sun, 08 Oct 2023 19:47:28 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779244362715946250 X-GMAIL-MSGID: 1779244362715946250 Hi all, Today's linux-next merge of the tip tree got a conflict in: include/linux/pci_ids.h between commit: 7e6f3b6d2c35 ("PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device") from the pci tree and commit: 24775700eaa9 ("x86/amd_nb: Add AMD Family MI300 PCI IDs") from the tip 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 include/linux/pci_ids.h index 3a8e24e9a93f,91b457de262e..000000000000 --- a/include/linux/pci_ids.h