From: Mark Brown <broonie@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Vinod Koul <vinod.koul@intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolin Chen <b42378@freescale.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the slave-dma tree
Date: Tue, 3 Dec 2013 16:48:24 +0000 [thread overview]
Message-ID: <20131203164824.GG27568@sirena.org.uk> (raw)
In-Reply-To: <20131203113852.63cc7e97a7a9e05f939f4ac1@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
On Tue, Dec 03, 2013 at 11:38:52AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sound-asoc tree got a conflict in
> sound/soc/fsl/fsl_ssi.c between commit bf02c7cb4314 ("ASoC: fsl_ssi: Add
> dual fifo mode support") from the slave-dma tree and commit 2924a9981006
> ("ASoC: fsl_ssi: Add monaural audio support for non-ac97 interface") from
> the sound-asoc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-12-03 16:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-03 0:38 linux-next: manual merge of the sound-asoc tree with the slave-dma tree Stephen Rothwell
2013-12-03 16:48 ` Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-01-13 1:43 Stephen Rothwell
2013-12-20 2:14 Stephen Rothwell
2012-03-05 2:59 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=20131203164824.GG27568@sirena.org.uk \
--to=broonie@kernel.org \
--cc=b42378@freescale.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vinod.koul@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).