From patchwork Thu Jun 8 00:57:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 104779 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp591517vqr; Wed, 7 Jun 2023 18:13:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5WpzuJtdj3DLg7VTj4fMOptl5H9fQ2EfOBuq1rfwrpkB6O3mokgAyzLRmFkGyw2vlJgQHg X-Received: by 2002:a05:6a00:310f:b0:662:3de1:2861 with SMTP id bi15-20020a056a00310f00b006623de12861mr642812pfb.6.1686186798512; Wed, 07 Jun 2023 18:13:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686186798; cv=none; d=google.com; s=arc-20160816; b=jN0HM2ZznwDp2Jz6w5AzLioKk7k6AQ4Q9N3RDkX3aiBT/kfxsPXhqjokeGEZQ7vhMN 00eEWEJWBQhOc2Ajm15NASB4v1n9rZDDcPz6Ed7KpcN3tfcUce80nMuKmkYRrc10mkE6 NvDiR2ObLfttsdab2bVS/g+9JnOIF8LT1CCgT7uYtNtLa2kT62zb4mvnRUpQEDAXdpz6 E8pj8bo+Y73HPZT2WfoNlRu3PwF1EP9y7EwbeRE18mTZUETvO5/+UQKUlyLea+ON5sjG LQvCtjp9UVZ5WjCLsfEm+Hols57U42JucQWc3++pa2x8AjuEW0WabCPE+3WEhykjOtxP Zi2Q== 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=xe7ysLQzAS2QF51u4lAR78h8WexS4TYt40aAzSqK7yw=; b=T0rb7gedKfpGvMdNm1x2Jv4TJAk+1SyK0yUAPGcrKjB+0zjTB/cvDH0m/sgEzDcFP1 MjyQSLXEwwP9hVepX/VNmilvf+Ux+t6JjkvwwOaCgNS3LOBTVGZ4RjmZRudS7foH4HIl nzpGif87+3Rx37LBTyB4vxkbLuMw8Lv80ABksyloD4CpwFhT6WhxDi/kKKcoTkgpj9hN E0h+V8rhDPKdcIBp3vCIFbAnc7NmFy3x7mU/atzC3iRd7Z5fni2wtaN7YqAFkbVyB+of wrIKOG8z0NlWDdIwM0RQBdk8jDVYz4MRbLPV3MANGi/vpsOXbsHh1CxAud1XLP9ceReK y9Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Fm3Dqj1Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 67-20020a630246000000b0052cc382507bsi108488pgc.727.2023.06.07.18.13.06; Wed, 07 Jun 2023 18:13:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Fm3Dqj1Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232622AbjFHA5V (ORCPT + 99 others); Wed, 7 Jun 2023 20:57:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232317AbjFHA5U (ORCPT ); Wed, 7 Jun 2023 20:57:20 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F247E46; Wed, 7 Jun 2023 17:57:19 -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 4Qc5Qh5npHz4x2c; Thu, 8 Jun 2023 10:57:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686185838; bh=xe7ysLQzAS2QF51u4lAR78h8WexS4TYt40aAzSqK7yw=; h=Date:From:To:Cc:Subject:From; b=Fm3Dqj1YYSWEQoh6CGsgRIWEeIhwrH8AhxglUQxh400NIed1o6hS87297eq3nJ/CO 0MKQwdB8KFf4Ef2xBgwCzcAdUY2ACqf1b3eEhxCfVyVZMzSojrc9u66HzleCRvpHuy NRrSMDpEITngmuTwBioavDk6hEORZMwP9GvSclWVYuQAycaXA457wilS4tbZtxX0kj 8NvuPgSgvGtYHX9w1Fpt4LKkRFvleyzR4JplPw7CQTW2dlFiWHRad5orw+igossVXk yna8JC6SHhnbQ1iATTsed8mAVthEAFGfZqYazIDyOYGCv8s9VN8IzNk7m3Yu/O/KDS F1UwTzPFL3UuQ== Date: Thu, 8 Jun 2023 10:57:14 +1000 From: Stephen Rothwell To: Takashi Iwai , Bjorn Helgaas , Lorenzo Pieralisi , Krzysztof =?utf-8?q?Wilczy=C5=84?= =?utf-8?q?ski?= Cc: Linux Kernel Mailing List , Linux Next Mailing List , Mike Pastore , Yanteng Si Subject: linux-next: manual merge of the sound tree with the pci tree Message-ID: <20230608105714.39ee3c3d@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768095008383902721?= X-GMAIL-MSGID: =?utf-8?q?1768095008383902721?= Hi all, Today's linux-next merge of the sound tree got a conflict in: include/linux/pci_ids.h between commit: 0ac448e0d29d ("PCI: Delay after FLR of Solidigm P44 Pro NVMe") from the pci tree and commit: 28bd137a3c8e ("ALSA: hda: Add Loongson LS7A HD-Audio support") from the sound 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 0f9cdc6195a1,c0c4ca8e2851..000000000000 --- a/include/linux/pci_ids.h