| Message ID | 20230925115446.12bf0047@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1006299vqu;
Sun, 24 Sep 2023 23:11:17 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IGz/ROGpQ5eaR9Sx2ieecGsr+4yStWzcho5pTwAr2MpmWQTkA/ZI0NwNm8Bkm4eMtHXOWmt
X-Received: by 2002:a05:690c:e17:b0:59f:4dcd:227e with SMTP id
cp23-20020a05690c0e1700b0059f4dcd227emr5412149ywb.37.1695622277190;
Sun, 24 Sep 2023 23:11:17 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1695622277; cv=none;
d=google.com; s=arc-20160816;
b=G5C83gS3YrUROe867yFvFAQtuziFdJthYY96TtHGby3ODk4P/puN0N7WtECmvWEp9e
9ypbsVNbmpUYsf8AjEkaLDo7/tTIYzTEp97067MQ7jEtCHbHki5NNZPvQP9eXBOl5CtV
A58iuz16uOW0Il7tkbRBYFiKk1wOgmUDd3jkjUmmhE39YW1G1rfkAQ23L78s5qLUgF7k
b1iWiZRr6LveYfNAnfvoXMamqGUCeWWIL3q9RWUIe7WGfwiDXhAgW0s5PdVqh/vt0zJh
pqwWH7wOy8htWDFswjdd4c8RUgK/qBeONkY0+J7gC3CaQ8oYTttIYpj5jlgIjOBO/gUs
p3lA==
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=illLIB5QiVO2I/ClRB29TMm1vjfH3lNfej6QyfJwAlA=;
fh=u+fBwc4I3QZwLv4xna15mnQD3r1j3CI8vhu5fj0gY8o=;
b=XKSxWcJ22kyYFeUXItiBW4wlb3aVlb5GQG4p28r7znLX2ajW8WqiAMJRJBdLM4AafK
+V8nbJZosV3ts/bv2Waq3radx/B3i8o/PpZHE7T6ns+cmpsMM3pBw/Cgk1fL6NOeAvjl
mqpL2SGrP/vR+Aqed4UeL4AJgKRvZQ2QZmynsPfb1rM4Z9nUeirhWrtS7RycwYjXZ2UP
4WW3g93RkGNnx68wlvkUV3O8wFB7P7kfGbr/7t3TRsGSa64mpASyQ0EbOJD5bMvCGMOG
ZSP5micUe4HlF/1FE1v8P8B9YZNRxFQEfQMLL9d2XOPJoDEQqqL5SljciItNVHWN/X0b
190Q==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=a1dkN4sq;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7])
by mx.google.com with ESMTPS id
r193-20020a632bca000000b0057458518e21si9380084pgr.630.2023.09.24.23.11.16
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 24 Sep 2023 23:11:17 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 as permitted sender)
client-ip=2620:137:e000::3:7;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=a1dkN4sq;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id D6F208029253;
Sun, 24 Sep 2023 18:54:53 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231612AbjIYBy5 (ORCPT <rfc822;ezelljr.billy@gmail.com>
+ 30 others); Sun, 24 Sep 2023 21:54:57 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45194 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229524AbjIYBy4 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 24 Sep 2023 21:54:56 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08222BD;
Sun, 24 Sep 2023 18:54:50 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1695606888;
bh=illLIB5QiVO2I/ClRB29TMm1vjfH3lNfej6QyfJwAlA=;
h=Date:From:To:Cc:Subject:From;
b=a1dkN4sqWf3EZaSUnXcpK1HH4yMS2zprFt5PRLs428UzH2rwT9tugkOQvbrFY7NZX
6+7mBYFtzXDgsCyiTiwDM4HHqJOUWLrIQJqiwUuXUQNTdZUAqrWSysBWtp6WpdhFC4
9rgZgKBaa6h8W36Cv/3mk3lL+j4ak456xFOj5/tj6KdN7aBalYJEdhbXp+6XW2kT4f
Tc0fLNgpwW7iMoZFcsWqO3qt6D0DyGzSIPBkHLBDVhQE8g7858gYQsw3hEvBjUsl2/
BjMQp2SUZ3DvfCpFevZlm9Wgrww1lKM0pqgrBxzliO1hZ9uXFY7+yQkOihwdcERYVe
BQMfDc5RiCTgw==
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 (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rv5Xm1Pkxz4xMC;
Mon, 25 Sep 2023 11:54:48 +1000 (AEST)
Date: Mon, 25 Sep 2023 11:54:46 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Takashi Iwai <tiwai@suse.de>
Cc: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stefan Binding <sbinding@opensource.cirrus.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Message-ID: <20230925115446.12bf0047@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/kFonsbELoWoR1fd.EnROUzm";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]);
Sun, 24 Sep 2023 18:54:53 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1777988824968680884
X-GMAIL-MSGID: 1777988824968680884
|
| Series |
linux-next: manual merge of the sound-asoc tree with the sound tree
|
|
Commit Message
Stephen Rothwell
Sept. 25, 2023, 1:54 a.m. UTC
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/pci/hda/cs35l41_hda.c
between commit:
447106e92a0c ("ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA")
from the sound tree and commit:
77bf613f0bf0 ("ASoC: cs35l41: Fix broken shared boost activation")
from the sound-asoc 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 sound/pci/hda/cs35l41_hda.c index 92b815ce193b,c74faa2ff46c..000000000000 --- a/sound/pci/hda/cs35l41_hda.c