From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@opensource•wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic•co.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix•de>,
"Sascha Hauer" <s.hauer@pengutronix•de>
Subject: linux-next: manual merge of the sound-asoc tree with the i.MX tree
Date: Thu, 30 Sep 2010 11:23:02 +1000 [thread overview]
Message-ID: <20100930112302.e554d367.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 659 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-mx3/devices.c between commit
4697bb926f43b8012ebd111ef43834f42126a0ef ("ARM: imx: dynamically allocate
imx-ssi devices") from the i.MX tree and commit
f0fba2ad1b6b53d5360125c41953b7afcd6deff0 ("ASoC: multi-component - ASoC
Multi-Component Support") from the sound-asoc tree.
The former removed that code that the latter changed. I just used the
former.
The latter was just changing some names, so ti may be able to be
integrated into the former.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-09-30 1:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 1:23 Stephen Rothwell [this message]
2010-09-30 3:31 ` linux-next: manual merge of the sound-asoc tree with the i.MX tree Mark Brown
2010-09-30 6:45 ` Uwe Kleine-König
2010-09-30 6:58 ` Mark Brown
2010-09-30 7:44 ` Uwe Kleine-König
2010-09-30 6:41 ` Uwe Kleine-König
2010-09-30 6:52 ` Uwe Kleine-König
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=20100930112302.e554d367.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lrg@slimlogic$(echo .)co.uk \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=u.kleine-koenig@pengutronix$(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