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: Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound-current tree
Date: Mon, 29 Nov 2021 11:35:54 +1100 [thread overview]
Message-ID: <20211129113554.59416109@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 783 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/soc/sof/intel/hda.c
between commit:
86f74ba3fef5 ("ASoC: SOF: hda: reset DAI widget before reconfiguring it")
from the sound-current tree and commit:
a0f84dfb3f6d ("ASoC: SOF: IPC: dai: Expand DAI_CONFIG IPC flags")
from the sound-asoc tree.
I fixed it up (I just used the latter version) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-11-29 0:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-29 0:35 Stephen Rothwell [this message]
2021-11-29 9:23 ` linux-next: manual merge of the sound-asoc tree with the sound-current tree Takashi Iwai
2021-11-29 12:10 ` Mark Brown
2021-11-29 14:29 ` Kai Vehmanen
2021-11-29 14:43 ` Takashi Iwai
2021-11-29 17:16 ` Kai Vehmanen
-- strict thread matches above, loose matches on Subject: below --
2017-08-25 2:57 Stephen Rothwell
2017-08-25 9:37 ` Andy Shevchenko
2017-08-25 9:40 ` Takashi Iwai
2017-08-25 11:02 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211129113554.59416109@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ranjani.sridharan@linux.intel.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox