[alsa-devel] ASoC updates
The following changes since commit cad9d90ec3f6c497dce2b163046436b6ab5cf6b6: Takashi Iwai (1): Merge branch 'fixes' of git://git.kernel.org/.../broonie/sound-2.6 into topic/asoc
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-tiwai
David Brownell (1): ASoC: Clocking fixes for davinci-evm.c
Dmitry Baryshkov (1): pxa2xx-ac97: switch AC unit to correct state before probing
Grazvydas Ignotas (1): ASoC: Mark non-connected TWL4030 pins for pandora
Jarkko Nikula (1): ASoC: OMAP: Select OMAP pin multiplexing when using Nokia N810 ASoC drivers
Peter Ujfalusi (2): ASoC: New enum type: value_enum ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
include/sound/soc-dapm.h | 15 +++ include/sound/soc.h | 30 ++++++ sound/arm/pxa2xx-ac97-lib.c | 25 +++-- sound/soc/codecs/twl4030.c | 118 +++++++++++------------- sound/soc/davinci/davinci-evm.c | 19 +++- sound/soc/omap/Kconfig | 1 + sound/soc/omap/omap3pandora.c | 13 +++ sound/soc/soc-core.c | 107 +++++++++++++++++++++ sound/soc/soc-dapm.c | 197 ++++++++++++++++++++++++++++++++++++++- 9 files changed, 447 insertions(+), 78 deletions(-)
At Mon, 5 Jan 2009 17:56:34 +0000, Mark Brown wrote:
The following changes since commit cad9d90ec3f6c497dce2b163046436b6ab5cf6b6: Takashi Iwai (1): Merge branch 'fixes' of git://git.kernel.org/.../broonie/sound-2.6 into topic/asoc
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-tiwai
Are all these 2.6.30 material or for 2.6.29? For 2.6.30, I'll create another branch. It won't be included in linux-next, too, until rc1 is reached (Stephen requested so), but we can keep it in our main branch, of course.
thanks,
Takashi
David Brownell (1): ASoC: Clocking fixes for davinci-evm.c
Dmitry Baryshkov (1): pxa2xx-ac97: switch AC unit to correct state before probing
Grazvydas Ignotas (1): ASoC: Mark non-connected TWL4030 pins for pandora
Jarkko Nikula (1): ASoC: OMAP: Select OMAP pin multiplexing when using Nokia N810 ASoC drivers
Peter Ujfalusi (2): ASoC: New enum type: value_enum ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
include/sound/soc-dapm.h | 15 +++ include/sound/soc.h | 30 ++++++ sound/arm/pxa2xx-ac97-lib.c | 25 +++-- sound/soc/codecs/twl4030.c | 118 +++++++++++------------- sound/soc/davinci/davinci-evm.c | 19 +++- sound/soc/omap/Kconfig | 1 + sound/soc/omap/omap3pandora.c | 13 +++ sound/soc/soc-core.c | 107 +++++++++++++++++++++ sound/soc/soc-dapm.c | 197 ++++++++++++++++++++++++++++++++++++++- 9 files changed, 447 insertions(+), 78 deletions(-)
On Mon, Jan 05, 2009 at 09:53:21PM +0100, Takashi Iwai wrote:
Are all these 2.6.30 material or for 2.6.29?
They're a bit on the edge, I'd expect them to be safe for 2.6.29 but the conservative thing would be to punt to 2.6.30. None of them are critical.
For 2.6.30, I'll create another branch. It won't be included in linux-next, too, until rc1 is reached (Stephen requested so), but we can keep it in our main branch, of course.
How about branching off a fixes branch for 2.6.29 rather than a -next branch? That way we can keep using the same branch for further fixes through the -rc series. Doesn't make much difference either way, though.
At Mon, 5 Jan 2009 21:09:18 +0000, Mark Brown wrote:
On Mon, Jan 05, 2009 at 09:53:21PM +0100, Takashi Iwai wrote:
Are all these 2.6.30 material or for 2.6.29?
They're a bit on the edge, I'd expect them to be safe for 2.6.29 but the conservative thing would be to punt to 2.6.30. None of them are critical.
OK, I'll include them in the next 2.6.29 pull request, which will be sent today.
For 2.6.30, I'll create another branch. It won't be included in linux-next, too, until rc1 is reached (Stephen requested so), but we can keep it in our main branch, of course.
How about branching off a fixes branch for 2.6.29 rather than a -next branch? That way we can keep using the same branch for further fixes through the -rc series. Doesn't make much difference either way, though.
Usually I make a fix-branch off like "fix/asoc" after rc1 or rc2, i.e. the linux-next tree starts accepting the next-kernel stuff. Until then, topic/* will keep the 2.6.29 stuff.
So my plan is to create next/asoc branch, switch to topic/asoc after the merge window, and use fix/asoc branch for further fixing.
thanks,
Takashi
participants (2)
-
Mark Brown -
Takashi Iwai