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-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Lars-Peter Clausen <lars@metafoo•de>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Date: Wed, 4 Feb 2015 13:44:58 +1100 [thread overview]
Message-ID: <20150204134458.474cd19a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/intel/sst-mfld-platform-pcm.c between commit ef46c7af93f9
("ALSA: pcm: Embed struct device") from the sound tree and commit
8686f251e482 ("ASoC: intel: Remove unnecessary
snd_pcm_lib_preallocate_free_for_all()") from the sound-asoc tree.
I fixed it up (the latter removed more than the former) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-02-04 2:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-04 2:44 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-01 2:50 linux-next: manual merge of the sound-asoc tree with the sound tree Stephen Rothwell
2019-08-01 16:46 ` Pierre-Louis Bossart
2019-08-09 3:16 Stephen Rothwell
2019-08-09 3:31 Stephen Rothwell
2019-10-07 23:52 Stephen Rothwell
2019-10-16 0:33 Stephen Rothwell
2019-11-12 1:26 Stephen Rothwell
2023-09-25 1:54 Stephen Rothwell
2023-10-20 1:26 Stephen Rothwell
2025-07-14 3:01 Stephen Rothwell
2025-07-14 9:18 ` Takashi Iwai
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=20150204134458.474cd19a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=lars@metafoo$(echo .)de \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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