| Message ID | 20231020122629.0289fe9b@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id
fe16csp759817vqb;
Thu, 19 Oct 2023 18:27:04 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IHV7rL+4mFJOJYLpNx3U5S9shS3yO0bwjRS5MY61SGaor604tkpcOGvS+fNK23hv76Nqd0T
X-Received: by 2002:a05:6870:1050:b0:1ea:3f79:defb with SMTP id
16-20020a056870105000b001ea3f79defbmr599184oaj.52.1697765223630;
Thu, 19 Oct 2023 18:27:03 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1697765223; cv=none;
d=google.com; s=arc-20160816;
b=oONcHuVOEcAFykExdBD5fOF3wwjGW7bC4ZNfaJMvbiqANsNhJQKPGpyNIJhY5JnbAy
2ZVzjeN+evLTOsZpTWB6o4WyKVb9nWF7+kAYqhqncZ47NYfNcN6hrNy77Wl0lAi4DNOg
aSw2cIzBmgVT6RDp8Emf/xxMBIgHv5UQkuqbSFioGH4t8mDFzDf2EH+WIGgYBtgxY8+M
1HtOBZQdTENhwZXUSPKWzaPgTuCxz2twa2/uDQfeAxRcwGCceoje6+GGG3jN5ZM/DshN
WNx9/+dFCxrJojWBx/xH49r8o52YdYVxe7JtL4HbVy0kkWjet+kms2Au588jy3KyBY5P
NwJQ==
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=1SA1xNxQvd8tzPgP9eFSc47dQbmQd+W12jRnSvCdfu8=;
fh=axy2k8uZ29XybLBj81gVv9ueLLpYJbFLawxZ3Xg7OeI=;
b=Qk9UyQ5y335A6k1F+SbFMUzZbunhurZqgfl/aaE4GuRn6ds+XWeiNcsWMjsob3cvDa
mpxTn+cAEn6KwUgNeLVCxh2RquPp0h8z1jAClAuK4U31r95NgscBzty05GK23IquAc28
TBgl0j6HyvDwcUAlSFo3HTU4oFvu1LviC2xxf6WtKEK5Iy83X0xGiX5gRsylPFLqVyWY
aFhiPpA2wXnVp1wnzTueHius0GGaGtY3UN571VGg92qa3ng7Ju1rKUlSLZyr4oeUZWtY
YmVjByO+bAysa9APlsMhbBVbKw1MS6mbzoEgQWju+RZQHM7BcrGVV3u5/EEMHNyOUbGC
UvGw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702
header.b="gs2/Av+T";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35])
by mx.google.com with ESMTPS id
j187-20020a638bc4000000b005b86119661esi720999pge.86.2023.10.19.18.27.03
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 19 Oct 2023 18:27:03 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702
header.b="gs2/Av+T";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 6CC9982663FA;
Thu, 19 Oct 2023 18:27:01 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1346814AbjJTB0k (ORCPT <rfc822;lkml4gm@gmail.com> + 25 others);
Thu, 19 Oct 2023 21:26:40 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41112 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1346768AbjJTB0i (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 19 Oct 2023 21:26:38 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 634D6112;
Thu, 19 Oct 2023 18:26:36 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1697765191;
bh=1SA1xNxQvd8tzPgP9eFSc47dQbmQd+W12jRnSvCdfu8=;
h=Date:From:To:Cc:Subject:From;
b=gs2/Av+T+z3A25jr3LKs9Qs1F9pt+UDhxFccMzbKmtVdYaLw/aIs/Md4TgLd5NxJ/
dPIrc+JWnVUTIYOI/9JkPdYyFfTHiIqA/WBLMiH59+GL3pIE/afpfIjy2ETlfSqU+B
7fI1wAYH5b4eROG8aZzWgKEkR+PzNWyTnZayuFNnc1bTf5s4fL0sqBX5kN+2u1XLq+
MyxeYT1guBFxgbLW+gFLPGhiOus2EmMlqCIFWQZe/Vu6r6Qs6Yi4f6Q6OHy6STIL8Y
AutyFqIl1oQYBYtXsQpip0xECKNaOSQIq0FAM8xZaL7pKxV+ppErw0gQRS3M01OUkk
yCfaUWeVzgPUA==
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 4SBRkZ4Mtcz4xFS;
Fri, 20 Oct 2023 12:26:30 +1100 (AEDT)
Date: Fri, 20 Oct 2023 12:26:29 +1100
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: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Message-ID: <20231020122629.0289fe9b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/SXrtF.7EoapPRK_DgYL+6VK";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
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 (groat.vger.email [0.0.0.0]);
Thu, 19 Oct 2023 18:27:01 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780235867151948209
X-GMAIL-MSGID: 1780235867151948209
|
| Series |
linux-next: manual merge of the sound-asoc tree with the sound tree
|
|
Commit Message
Stephen Rothwell
Oct. 20, 2023, 1:26 a.m. UTC
Hi all,
Today's linux-next merge of the sound-asoc tree got conflicts in:
sound/soc/sof/intel/hda.h
sound/soc/sof/sof-priv.h
between commits:
17baaa1f950b ("ASoC: SOF: core: Add probe_early and remove_late callbacks")
3d1a05581361 ("ASoC: SOF: Intel: Move binding to display driver outside of deferred probe")
from the sound tree and commit:
e4d09de3919b ("ASoC: SOF: make .remove callback return void")
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/soc/sof/intel/hda.h index 8e846684279e,0ebc042c5ce1..000000000000 --- a/sound/soc/sof/intel/hda.h diff --cc sound/soc/sof/sof-priv.h index e73a92189fe1,40bca5f80428..000000000000 --- a/sound/soc/sof/sof-priv.h