[alsa-devel] ASoC updates for 2.6.37
The following changes since commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0:
Merge branch 'for-2.6.37' into for-2.6.38 (2010-11-29 18:33:47 +0000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37
All isolated bug fixes in drivers, and in the case of s6000 the fact that it won't build anyway does lower the risk :)
Axel Lin (1): ASoC: Fix missing spin_unlock_irqrestore
Daniel Glöckner (3): s6000-i2s: fix compilation s6000-pcm: fix compilation s6105-ipcam: fix compilation
Dimitris Papastamos (1): ASoC: WM8731: Fix incorrect mask for bypass path disable
sound/soc/codecs/wm8731.c | 2 +- sound/soc/nuc900/nuc900-pcm.c | 9 +++++---- sound/soc/s6000/s6000-i2s.c | 2 +- sound/soc/s6000/s6000-pcm.c | 2 +- sound/soc/s6000/s6105-ipcam.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-)
At Thu, 2 Dec 2010 13:28:10 +0000, Mark Brown wrote:
The following changes since commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0:
Merge branch 'for-2.6.37' into for-2.6.38 (2010-11-29 18:33:47 +0000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37
All isolated bug fixes in drivers, and in the case of s6000 the fact that it won't build anyway does lower the risk :)
Thanks, pulled now. Will send a pull request to Linus tomorrow, once after checking linux-next integration.
Takashi
Axel Lin (1): ASoC: Fix missing spin_unlock_irqrestore
Daniel Glöckner (3): s6000-i2s: fix compilation s6000-pcm: fix compilation s6105-ipcam: fix compilation
Dimitris Papastamos (1): ASoC: WM8731: Fix incorrect mask for bypass path disable
sound/soc/codecs/wm8731.c | 2 +- sound/soc/nuc900/nuc900-pcm.c | 9 +++++---- sound/soc/s6000/s6000-i2s.c | 2 +- sound/soc/s6000/s6000-pcm.c | 2 +- sound/soc/s6000/s6105-ipcam.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-)
On Thu, Dec 02, 2010 at 05:17:13PM +0100, Takashi Iwai wrote:
Thanks, pulled now. Will send a pull request to Linus tomorrow, once after checking linux-next integration.
Thanks. These should all be in the -next build for today so I'd expect that to be fine, though there could be issues due to the different merge ordering from being in your tree rather than mine.
At Thu, 2 Dec 2010 16:18:42 +0000, Mark Brown wrote:
On Thu, Dec 02, 2010 at 05:17:13PM +0100, Takashi Iwai wrote:
Thanks, pulled now. Will send a pull request to Linus tomorrow, once after checking linux-next integration.
Thanks. These should all be in the -next build for today so I'd expect that to be fine, though there could be issues due to the different merge ordering from being in your tree rather than mine.
Yeah, it's really "just to be sure" :)
Takashi
On Thu, 2010-12-02 at 17:17 +0100, Takashi Iwai wrote:
At Thu, 2 Dec 2010 13:28:10 +0000, Mark Brown wrote:
The following changes since commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0:
Merge branch 'for-2.6.37' into for-2.6.38 (2010-11-29 18:33:47 +0000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37
All isolated bug fixes in drivers, and in the case of s6000 the fact that it won't build anyway does lower the risk :)
Thanks, pulled now. Will send a pull request to Linus tomorrow, once after checking linux-next integration.
oh, in that case I have one fix for 2.6.37 :-
The following changes since commit 39a545559f8d5f13e8a4a7dfddcaad0e2ba9bcfb:
ASoC: Add missing dev_set_drvdata in p1022_ds_probe (2010-11-29 18:28:53 +0000)
are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.37
Jarkko Nikula (1): ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency
sound/soc/omap/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Thanks
Liam
At Thu, 02 Dec 2010 16:29:24 +0000, Liam Girdwood wrote:
On Thu, 2010-12-02 at 17:17 +0100, Takashi Iwai wrote:
At Thu, 2 Dec 2010 13:28:10 +0000, Mark Brown wrote:
The following changes since commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0:
Merge branch 'for-2.6.37' into for-2.6.38 (2010-11-29 18:33:47 +0000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37
All isolated bug fixes in drivers, and in the case of s6000 the fact that it won't build anyway does lower the risk :)
Thanks, pulled now. Will send a pull request to Linus tomorrow, once after checking linux-next integration.
oh, in that case I have one fix for 2.6.37 :-
The following changes since commit 39a545559f8d5f13e8a4a7dfddcaad0e2ba9bcfb:
ASoC: Add missing dev_set_drvdata in p1022_ds_probe (2010-11-29 18:28:53 +0000)
are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.37
OK, pulled this one, too.
thanks,
Takashi
Jarkko Nikula (1): ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency
sound/soc/omap/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Thanks
Liam
participants (3)
-
Liam Girdwood -
Mark Brown -
Takashi Iwai