Skip to contentSkip to conversation

ASoC updates for 3.4

DISCUSSION Mark Brown 2 participants 10 messages Jan 24, 2012 – Jan 26, 2012

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:

Linux 3.3-rc1 (2012-01-19 15:04:48 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-3.4

for you to fetch changes up to 5509f2f80c711add6bbcec9af7f4bbba2e2cc22b:

ASoC: wm5100: Fix warnings from recent patches (2012-01-24 19:51:34 +0000)

----------------------------------------------------------------
A random collection of updates, pretty much all driver specific cleanups of various kinds which have accumilated over the merge window. There's one feature (support for announcing msbits in the core) and a merge over of a new regmap feature (register patches) the initial users for which are a few ASoC drivers.

----------------------------------------------------------------

(I'm also trying this shiny new git signed tags foo, which may well not actually accomplish anything if you're not using a shiny new git 1.7.9 prerelease, though the regmap merge did the right thing at least. If the asoc-3.4 tag can't be pulled correctly then the for-3.4 branch is still there as normal.)

Axel Lin (2):
ASoC: jz4740: Convert qi_lb60 to use snd_soc_register_card()
ASoC: Add __devinit/__devexit annotations at necessary places

Dimitris Papastamos (1):
ASoC: wm8983: Remove useless snd_kcontrol

Fabio Estevam (2):
ASoC: sgtl5000: Print revision number in hex
ASoC: sgtl5000: Convert to table based DAPM and control init

Javier Martin (2):
ASoC: Route Mic Bias in Visstrim_M10 board.
ASoC: Add external amplifier controls for Visstrim_M10.

Joachim Eastwood (2):
ASoC: use proper defines for stream directions in pcm engines
ASoC: replace 0xffffffff with DMA_BIT_MASK macro

Liam Girdwood (3):
ASoC: core - Improve card registration error messaging for large DAI links.
ASoC: twl6040 - add method to query HS DC offset step size in mV
ASoC: utils - Add support for a dummy codec driver.

Manjunath Hadli (1):
ASoC: CQ93VC: remove machine specific header file inclusion from codec driver

Mark Brown (66):
ASoC: Mark WM5100 register map cache only when going into BIAS_OFF
ASoC: Don't go through cache when applying WM5100 rev A updates
ASoC: Disable register synchronisation for low frequency WM8996 SYSCLK
ASoC: Make WM8978 I2C usage unconditional
ASoC: Remove unused control type from wm8978 driver
ASoC: Convert wm8978 to table based DAPM and control init
ASoC: Convert wm8978 to devm_kzalloc()
ASoC: Use standard cache sync for WM8978
ASoC: Convert wm8978 to direct regmap API usage
ASoC: Push wm8978 reset down into the I2C probe
ASoC: Convert WM9090 to use regmap directly
ASoC: Move WM9090 device identification and reset to I2C probe
ASoC: Convert wm8993 to direct regmap API usage
ASoC: Move WM8993 resource acquisition and device reset to bus probe
ASoC: Convert WM8753 to direct regmap API usage
ASoC: Make WM8971 I2C usage unconditional
ASoC: Convert wm8971 to table based DAPM and control init
ASoC: Convert wm8971 to devm_kzalloc()
ASoC: Make wm8974 I2C usage unconditional
ASoC: Convert wm8974 to table based DAPM and control init
ASoC: Remove wm8974 private data
ASoC: Use standard cache sync for wm8804
ASoC: Convert wm8804 to devm_kzalloc()
ASoC: Convert wm8804 to direct regmap API usage
ASoC: Make WM8904 I2C usage unconditional
ASoC: Convert wm8904 to devm_kzalloc()
ASoC: Use standard cache sync for WM8904
ASoC: Convert WM8904 to direct regmap API usage
ASoC: Make I2C usage unconditional in WM8940
ASoC: Convert WM8940 to devm_kzalloc()
ASoC: Make I2C usage unconditional in WM8955
ASoC: Convert WM8955 to devm_kzalloc()
ASoC: Use standard register cache sync for WM8955
ASoC: Convert WM8955 to direct regmap API usage
ASoC: Convert WM8955 to table based DAPM and control init
ASoC: Optimise performance of WM8904 ADC 128fs OSR mode
ASoC: Make WM8962 I2C usage unconditional
ASoC: Convert WM8962 register access map to modern style
ASoC: Add WM8962 DAC and ADC L/R swap support
ASoC: Allow drivers to specify how many bits are significant on a DAI
ASoC: 24 bits are significant on the WM8996 audio interfaces
ASoC: Implement basic WM8993 interrupt support
ASoC: Make WM8993 I2C usage unconditional
ASoC: 24 bits are significant on wm_hubs DAIs
ASoC: When releasing WM5100 put /RESET into reset
ASoC: Say we can't read WM5100 ID register
ASoC: Remove redundant set_bias_level() from WM5100 remove()
ASoC: Make WM5100 interrupt path use regmap directly
ASoC: Push WM5100 interrupt request into I2C probe
ASoC: Don't tell applications about msbits unless we're ignoring input
ASoC: Use regmap update bits operation for drivers using regmap
ASoC: Fix build of tlv320dac33
ASoC: wm8985: Convert to devm_kzalloc()
ASoC: wm8985: Convert to table based DAPM and control init
ASoC: wm8985: Use standard cache sync implementation
ASoC: wm8985 Don't directly reference the cache data structure
ASoC: wm8985: Convert to direct regmap API usage
ASoC: wm8988: Convert to table based DAPM and control init
ASoC: wm8988: Convert to devm_kzalloc()
ASoC: sgtl5000: It's sgtl5000 not sgtl500
regmap: Support register patch sets
ASoC: Convert WM8731 to direct regmap API usage
ASoC: wm5100: Fix mismerge of IRQ frees
Merge tag 'regmap-patch-initial' of git://git.kernel.org/.../broonie/regmap into for-3.4
ASoC: Convert the WM5100 revision A updates to a regmap patch
ASoC: wm5100: Fix warnings from recent patches

Peter Ujfalusi (4):
ASoC: tlv320dac33: Use core to set the msbits constraint
ASoC: twl4030: Use core to set the msbits constraint
ASoC: omap-dmic: Use core to set the msbits constraint
ASoC: omap-mcpdm: Set 24msbits constraint

Ryan Mallon (1):
ep93xx: Don't use system controller defines in audio drivers

Wolfram Sang (2):
ASoC: tlv320aic32x4: always enable dividers
ASoC: tlv320aic32x4: always enable analouge block

Zeng Zhaoming (1):
ASoC: sgtl5000: Fix wrong register name in restore

 arch/arm/mach-ep93xx/core.c                  |   19 +-
 arch/arm/mach-ep93xx/include/mach/platform.h |    2 +-
 arch/mips/jz4740/board-qi_lb60.c             |    6 +
 drivers/base/regmap/internal.h               |    3 +
 drivers/base/regmap/regcache.c               |   11 +
 drivers/base/regmap/regmap.c                 |   58 +
 include/linux/regmap.h                       |    3 +
 include/sound/soc.h                          |    2 +
 sound/soc/atmel/atmel-pcm.c                  |    4 +-
 sound/soc/codecs/alc5623.c                   |    4 +-
 sound/soc/codecs/alc5632.c                   |    2 +-
 sound/soc/codecs/cq93vc.c                    |    2 -
 sound/soc/codecs/sgtl5000.c                  |   36 +-
 sound/soc/codecs/tlv320aic32x4.c             |  110 +-
 sound/soc/codecs/tlv320dac33.c               |    6 +-
 sound/soc/codecs/twl4030.c                   |    7 +-
 sound/soc/codecs/twl6040.c                   |   13 +
 sound/soc/codecs/twl6040.h                   |    1 +
 sound/soc/codecs/wm5100.c                    |  356 +++---
 sound/soc/codecs/wm8731.c                    |  109 ++-
 sound/soc/codecs/wm8753.c                    |  186 ++-
 sound/soc/codecs/wm8804.c                    |  146 +--
 sound/soc/codecs/wm8904.c                    |  838 ++++--------
 sound/soc/codecs/wm8904.h                    |   11 +
 sound/soc/codecs/wm8940.c                    |   14 +-
 sound/soc/codecs/wm8955.c                    |  247 ++--
 sound/soc/codecs/wm8962.c                    | 1819 +++++++++-----------------
 sound/soc/codecs/wm8971.c                    |   37 +-
 sound/soc/codecs/wm8974.c                    |   45 +-
 sound/soc/codecs/wm8978.c                    |  185 ++-
 sound/soc/codecs/wm8978.h                    |    2 +
 sound/soc/codecs/wm8983.c                    |    5 -
 sound/soc/codecs/wm8985.c                    |  315 +++--
 sound/soc/codecs/wm8988.c                    |   29 +-
 sound/soc/codecs/wm8993.c                    |  599 ++++++---
 sound/soc/codecs/wm8994.c                    |    8 +-
 sound/soc/codecs/wm8996.c                    |    8 +
 sound/soc/codecs/wm8996.h                    |    4 +
 sound/soc/codecs/wm9090.c                    |  266 ++--
 sound/soc/davinci/davinci-pcm.c              |    4 +-
 sound/soc/ep93xx/edb93xx.c                   |    4 +-
 sound/soc/ep93xx/ep93xx-pcm.c                |    4 +-
 sound/soc/ep93xx/snappercl15.c               |    4 +-
 sound/soc/fsl/fsl_dma.c                      |   10 +-
 sound/soc/fsl/mpc5200_dma.c                  |   16 +-
 sound/soc/imx/mx27vis-aic32x4.c              |  104 ++
 sound/soc/jz4740/qi_lb60.c                   |   56 +-
 sound/soc/kirkwood/kirkwood-dma.c            |    4 +-
 sound/soc/omap/omap-dmic.c                   |    7 +-
 sound/soc/omap/omap-mcpdm.c                  |    2 +
 sound/soc/s6000/s6000-pcm.c                  |    5 +-
 sound/soc/samsung/dma.c                      |    2 +-
 sound/soc/soc-core.c                         |   33 +-
 sound/soc/soc-dapm.c                         |   27 +-
 sound/soc/soc-io.c                           |    1 +
 sound/soc/soc-pcm.c                          |   38 +
 sound/soc/soc-utils.c                        |   20 +-
 sound/soc/tegra/tegra_pcm.c                  |    2 +-
 58 files changed, 2917 insertions(+), 2944 deletions(-)
#1 lore raw

At Tue, 24 Jan 2012 20:11:57 +0000,

Quoted 20 lines · Mark Brown

The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:

Linux 3.3-rc1 (2012-01-19 15:04:48 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-3.4

for you to fetch changes up to 5509f2f80c711add6bbcec9af7f4bbba2e2cc22b:

ASoC: wm5100: Fix warnings from recent patches (2012-01-24 19:51:34 +0000)

----------------------------------------------------------------
A random collection of updates, pretty much all driver specific cleanups of various kinds which have accumilated over the merge window. There's one feature (support for announcing msbits in the core) and a merge over of a new regmap feature (register patches) the initial users for which are a few ASoC drivers.

Quoted 7 lines

----------------------------------------------------------------

(I'm also trying this shiny new git signed tags foo, which may well not actually accomplish anything if you're not using a shiny new git 1.7.9 prerelease, though the regmap merge did the right thing at least. If the asoc-3.4 tag can't be pulled correctly then the for-3.4 branch is still there as normal.)

Yeah, my git is still 1.7.8.x and it doesn't seem to work well with the singed tag, so I pulled for-3.x branches now.

I'm going to upgrade in this week sometime later.

thanks,

Takashi

Quoted 173 lines

Axel Lin (2):
ASoC: jz4740: Convert qi_lb60 to use snd_soc_register_card()
ASoC: Add __devinit/__devexit annotations at necessary places

Dimitris Papastamos (1):
ASoC: wm8983: Remove useless snd_kcontrol

Fabio Estevam (2):
ASoC: sgtl5000: Print revision number in hex
ASoC: sgtl5000: Convert to table based DAPM and control init

Javier Martin (2):
ASoC: Route Mic Bias in Visstrim_M10 board.
ASoC: Add external amplifier controls for Visstrim_M10.

Joachim Eastwood (2):
ASoC: use proper defines for stream directions in pcm engines
ASoC: replace 0xffffffff with DMA_BIT_MASK macro

Liam Girdwood (3):
ASoC: core - Improve card registration error messaging for large DAI links.
ASoC: twl6040 - add method to query HS DC offset step size in mV
ASoC: utils - Add support for a dummy codec driver.

Manjunath Hadli (1):
ASoC: CQ93VC: remove machine specific header file inclusion from codec driver

Mark Brown (66):
ASoC: Mark WM5100 register map cache only when going into BIAS_OFF
ASoC: Don't go through cache when applying WM5100 rev A updates
ASoC: Disable register synchronisation for low frequency WM8996 SYSCLK
ASoC: Make WM8978 I2C usage unconditional
ASoC: Remove unused control type from wm8978 driver
ASoC: Convert wm8978 to table based DAPM and control init
ASoC: Convert wm8978 to devm_kzalloc()
ASoC: Use standard cache sync for WM8978
ASoC: Convert wm8978 to direct regmap API usage
ASoC: Push wm8978 reset down into the I2C probe
ASoC: Convert WM9090 to use regmap directly
ASoC: Move WM9090 device identification and reset to I2C probe
ASoC: Convert wm8993 to direct regmap API usage
ASoC: Move WM8993 resource acquisition and device reset to bus probe
ASoC: Convert WM8753 to direct regmap API usage
ASoC: Make WM8971 I2C usage unconditional
ASoC: Convert wm8971 to table based DAPM and control init
ASoC: Convert wm8971 to devm_kzalloc()
ASoC: Make wm8974 I2C usage unconditional
ASoC: Convert wm8974 to table based DAPM and control init
ASoC: Remove wm8974 private data
ASoC: Use standard cache sync for wm8804
ASoC: Convert wm8804 to devm_kzalloc()
ASoC: Convert wm8804 to direct regmap API usage
ASoC: Make WM8904 I2C usage unconditional
ASoC: Convert wm8904 to devm_kzalloc()
ASoC: Use standard cache sync for WM8904
ASoC: Convert WM8904 to direct regmap API usage
ASoC: Make I2C usage unconditional in WM8940
ASoC: Convert WM8940 to devm_kzalloc()
ASoC: Make I2C usage unconditional in WM8955
ASoC: Convert WM8955 to devm_kzalloc()
ASoC: Use standard register cache sync for WM8955
ASoC: Convert WM8955 to direct regmap API usage
ASoC: Convert WM8955 to table based DAPM and control init
ASoC: Optimise performance of WM8904 ADC 128fs OSR mode
ASoC: Make WM8962 I2C usage unconditional
ASoC: Convert WM8962 register access map to modern style
ASoC: Add WM8962 DAC and ADC L/R swap support
ASoC: Allow drivers to specify how many bits are significant on a DAI
ASoC: 24 bits are significant on the WM8996 audio interfaces
ASoC: Implement basic WM8993 interrupt support
ASoC: Make WM8993 I2C usage unconditional
ASoC: 24 bits are significant on wm_hubs DAIs
ASoC: When releasing WM5100 put /RESET into reset
ASoC: Say we can't read WM5100 ID register
ASoC: Remove redundant set_bias_level() from WM5100 remove()
ASoC: Make WM5100 interrupt path use regmap directly
ASoC: Push WM5100 interrupt request into I2C probe
ASoC: Don't tell applications about msbits unless we're ignoring input
ASoC: Use regmap update bits operation for drivers using regmap
ASoC: Fix build of tlv320dac33
ASoC: wm8985: Convert to devm_kzalloc()
ASoC: wm8985: Convert to table based DAPM and control init
ASoC: wm8985: Use standard cache sync implementation
ASoC: wm8985 Don't directly reference the cache data structure
ASoC: wm8985: Convert to direct regmap API usage
ASoC: wm8988: Convert to table based DAPM and control init
ASoC: wm8988: Convert to devm_kzalloc()
ASoC: sgtl5000: It's sgtl5000 not sgtl500
regmap: Support register patch sets
ASoC: Convert WM8731 to direct regmap API usage
ASoC: wm5100: Fix mismerge of IRQ frees
Merge tag 'regmap-patch-initial' of git://git.kernel.org/.../broonie/regmap into for-3.4
ASoC: Convert the WM5100 revision A updates to a regmap patch
ASoC: wm5100: Fix warnings from recent patches

Peter Ujfalusi (4):
ASoC: tlv320dac33: Use core to set the msbits constraint
ASoC: twl4030: Use core to set the msbits constraint
ASoC: omap-dmic: Use core to set the msbits constraint
ASoC: omap-mcpdm: Set 24msbits constraint

Ryan Mallon (1):
ep93xx: Don't use system controller defines in audio drivers

Wolfram Sang (2):
ASoC: tlv320aic32x4: always enable dividers
ASoC: tlv320aic32x4: always enable analouge block

Zeng Zhaoming (1):
ASoC: sgtl5000: Fix wrong register name in restore

 arch/arm/mach-ep93xx/core.c                  |   19 +-
 arch/arm/mach-ep93xx/include/mach/platform.h |    2 +-
 arch/mips/jz4740/board-qi_lb60.c             |    6 +
 drivers/base/regmap/internal.h               |    3 +
 drivers/base/regmap/regcache.c               |   11 +
 drivers/base/regmap/regmap.c                 |   58 +
 include/linux/regmap.h                       |    3 +
 include/sound/soc.h                          |    2 +
 sound/soc/atmel/atmel-pcm.c                  |    4 +-
 sound/soc/codecs/alc5623.c                   |    4 +-
 sound/soc/codecs/alc5632.c                   |    2 +-
 sound/soc/codecs/cq93vc.c                    |    2 -
 sound/soc/codecs/sgtl5000.c                  |   36 +-
 sound/soc/codecs/tlv320aic32x4.c             |  110 +-
 sound/soc/codecs/tlv320dac33.c               |    6 +-
 sound/soc/codecs/twl4030.c                   |    7 +-
 sound/soc/codecs/twl6040.c                   |   13 +
 sound/soc/codecs/twl6040.h                   |    1 +
 sound/soc/codecs/wm5100.c                    |  356 +++---
 sound/soc/codecs/wm8731.c                    |  109 ++-
 sound/soc/codecs/wm8753.c                    |  186 ++-
 sound/soc/codecs/wm8804.c                    |  146 +--
 sound/soc/codecs/wm8904.c                    |  838 ++++--------
 sound/soc/codecs/wm8904.h                    |   11 +
 sound/soc/codecs/wm8940.c                    |   14 +-
 sound/soc/codecs/wm8955.c                    |  247 ++--
 sound/soc/codecs/wm8962.c                    | 1819 +++++++++-----------------
 sound/soc/codecs/wm8971.c                    |   37 +-
 sound/soc/codecs/wm8974.c                    |   45 +-
 sound/soc/codecs/wm8978.c                    |  185 ++-
 sound/soc/codecs/wm8978.h                    |    2 +
 sound/soc/codecs/wm8983.c                    |    5 -
 sound/soc/codecs/wm8985.c                    |  315 +++--
 sound/soc/codecs/wm8988.c                    |   29 +-
 sound/soc/codecs/wm8993.c                    |  599 ++++++---
 sound/soc/codecs/wm8994.c                    |    8 +-
 sound/soc/codecs/wm8996.c                    |    8 +
 sound/soc/codecs/wm8996.h                    |    4 +
 sound/soc/codecs/wm9090.c                    |  266 ++--
 sound/soc/davinci/davinci-pcm.c              |    4 +-
 sound/soc/ep93xx/edb93xx.c                   |    4 +-
 sound/soc/ep93xx/ep93xx-pcm.c                |    4 +-
 sound/soc/ep93xx/snappercl15.c               |    4 +-
 sound/soc/fsl/fsl_dma.c                      |   10 +-
 sound/soc/fsl/mpc5200_dma.c                  |   16 +-
 sound/soc/imx/mx27vis-aic32x4.c              |  104 ++
 sound/soc/jz4740/qi_lb60.c                   |   56 +-
 sound/soc/kirkwood/kirkwood-dma.c            |    4 +-
 sound/soc/omap/omap-dmic.c                   |    7 +-
 sound/soc/omap/omap-mcpdm.c                  |    2 +
 sound/soc/s6000/s6000-pcm.c                  |    5 +-
 sound/soc/samsung/dma.c                      |    2 +-
 sound/soc/soc-core.c                         |   33 +-
 sound/soc/soc-dapm.c                         |   27 +-
 sound/soc/soc-io.c                           |    1 +
 sound/soc/soc-pcm.c                          |   38 +
 sound/soc/soc-utils.c                        |   20 +-
 sound/soc/tegra/tegra_pcm.c                  |    2 +-
 58 files changed, 2917 insertions(+), 2944 deletions(-)

[2 Digital signature <application/pgp-signature (7bit)>]

author
#2 lore raw
Quoted 1 line · Takashi Iwai

Yeah, my git is still 1.7.8.x and it doesn't seem to work well with

Oh, well. I think it's the tag rather than the signed bit.

Quoted 1 line

the singed tag, so I pulled for-3.x branches now.

Trust me, you don't want to hear my singing :)

Quoted 1 line

I'm going to upgrade in this week sometime later.

I wouldn't worry, it's still not a full release I believe and it's not exactly crtitical. The only reason I'm trying it right now is because I was setting up my new GPG smartcard Debian has packages already (but do let me know when you have upgraded and I'll try again).

Actually, looking again I can generate a tag with the same name as the branch quite happily - if I do that when requesting pulls then everything should transparently do the right thing, older versions of git will pick up the branch rather than the tag and newer ones will prefer the tag and so get the signature goodness. He said hopefully :)

#3 lore raw

At Tue, 24 Jan 2012 20:46:16 +0000,

Quoted 6 lines · Mark Brown
Quoted 1 line · Takashi Iwai

Yeah, my git is still 1.7.8.x and it doesn't seem to work well with

Oh, well. I think it's the tag rather than the signed bit.

I'm not entirely sure who to blame. The error message is:

% git pull git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-3.3-20120124
fatal: Couldn't find remote ref asoc-3.3-20120124

Quoted 3 lines
Quoted 1 line

the singed tag, so I pulled for-3.x branches now.

Trust me, you don't want to hear my singing :)

Heh, it's an interesting idea to embed an MP3 data in the tag comment :)

Quoted 7 lines
Quoted 1 line

I'm going to upgrade in this week sometime later.

I wouldn't worry, it's still not a full release I believe and it's not exactly crtitical. The only reason I'm trying it right now is because I was setting up my new GPG smartcard Debian has packages already (but do let me know when you have upgraded and I'll try again).

Quoted 5 lines

Actually, looking again I can generate a tag with the same name as the branch quite happily - if I do that when requesting pulls then everything should transparently do the right thing, older versions of git will pick up the branch rather than the tag and newer ones will prefer the tag and so get the signature goodness. He said hopefully :)

Sounds like a good solution.

thanks,

Takashi

author
#4 lore raw
Quoted 11 lines · Takashi Iwai
Quoted 5 lines · Mark Brown
Quoted 1 line · Takashi Iwai

Yeah, my git is still 1.7.8.x and it doesn't seem to work well with

Oh, well. I think it's the tag rather than the signed bit.

I'm not entirely sure who to blame. The error message is:

% git pull git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-3.3-20120124
fatal: Couldn't find remote ref asoc-3.3-20120124

That's the tagging - older (and by older I mean "currently released") versions of git can only pull from branches so that's just saying it can't find the tag object.

#5 lore raw

At Wed, 25 Jan 2012 11:35:09 +0000,

Quoted 10 lines · Mark Brown

[1 <text/plain; us-ascii (quoted-printable)>]

Quoted 6 lines · Takashi Iwai
Quoted 5 lines · Mark Brown
Quoted 1 line · Takashi Iwai

Yeah, my git is still 1.7.8.x and it doesn't seem to work well with

Oh, well. I think it's the tag rather than the signed bit.

Quoted 8 lines
Quoted 4 lines

I'm not entirely sure who to blame. The error message is:

% git pull git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-3.3-20120124
fatal: Couldn't find remote ref asoc-3.3-20120124

That's the tagging - older (and by older I mean "currently released") versions of git can only pull from branches so that's just saying it can't find the tag object.

It seems that the problem is rather in the server side. I updated the git to version 1.7.9.rc2, but it still gives the same error at pull. Meanwhile, I could pull a signed tag from a local tree. Or I'm overlooking something obvious.

BTW, the pull of a signed tag gives always a merge commit even if it can be fast-forwarded. The --ff option doesn't work, too. This is the intended behavior, AFAIK.

OTOH, we don't want to see too many merge commits in a straight development line while the development phase. So, pulling signed tags from you while development might be not always ideal, if we want to keep the sound git trees better in sync.

thanks,

Takashi

author
#6 lore raw
Quoted 10 lines · Takashi Iwai
Quoted 3 lines · Mark Brown

That's the tagging - older (and by older I mean "currently released") versions of git can only pull from branches so that's just saying it can't find the tag object.

It seems that the problem is rather in the server side. I updated the git to version 1.7.9.rc2, but it still gives the same error at pull. Meanwhile, I could pull a signed tag from a local tree. Or I'm overlooking something obvious.

I've deleted the tag since. If you try pulling from

git://git.kernel.org/pub/scm/kernel/git/broonie/regmap.git topic/patch

it should DTRT (I hope).

Quoted 8 lines

BTW, the pull of a signed tag gives always a merge commit even if it can be fast-forwarded. The --ff option doesn't work, too. This is the intended behavior, AFAIK.

OTOH, we don't want to see too many merge commits in a straight development line while the development phase. So, pulling signed tags from you while development might be not always ideal, if we want to keep the sound git trees better in sync.

I'm not sure it's much of an issue, but I guess it's not a big deal. I'd prefer to use the signed tags for the fixes if that's OK, but I'll omit them for development branches. Or hold back on pushing to you so often or something (we're integration testing via -next after all).

#7 lore raw

At Thu, 26 Jan 2012 15:57:39 +0000,

Quoted 13 lines · Mark Brown
Quoted 10 lines · Takashi Iwai
Quoted 3 lines · Mark Brown

That's the tagging - older (and by older I mean "currently released") versions of git can only pull from branches so that's just saying it can't find the tag object.

It seems that the problem is rather in the server side. I updated the git to version 1.7.9.rc2, but it still gives the same error at pull. Meanwhile, I could pull a signed tag from a local tree. Or I'm overlooking something obvious.

Quoted 5 lines

I've deleted the tag since. If you try pulling from

git://git.kernel.org/pub/scm/kernel/git/broonie/regmap.git topic/patch

it should DTRT (I hope).

Hm, still I get an error...

% git --version
git version 1.7.9.rc2
% git pull git://git.kernel.org/pub/scm/kernel/git/broonie/regmap.git topic/patch
fatal: The remote end hung up unexpectedly

Quoted 9 lines
Quoted 8 lines

BTW, the pull of a signed tag gives always a merge commit even if it can be fast-forwarded. The --ff option doesn't work, too. This is the intended behavior, AFAIK.

OTOH, we don't want to see too many merge commits in a straight development line while the development phase. So, pulling signed tags from you while development might be not always ideal, if we want to keep the sound git trees better in sync.

Quoted 4 lines

I'm not sure it's much of an issue, but I guess it's not a big deal. I'd prefer to use the signed tags for the fixes if that's OK, but I'll omit them for development branches. Or hold back on pushing to you so often or something (we're integration testing via -next after all).

Agreed. It's just a matter of balance, and we can make it somehow certainly.

Takashi

author
#8 lore raw
Quoted 5 lines · Takashi Iwai

Mark Brown wrote:

git version 1.7.9.rc2
% git pull git://git.kernel.org/pub/scm/kernel/git/broonie/regmap.git topic/patch
fatal: The remote end hung up unexpectedly

Typo in the URL, should be:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git topic/patch

#9 lore raw

At Thu, 26 Jan 2012 16:40:48 +0000,

Quoted 11 lines · Mark Brown
Quoted 5 lines · Takashi Iwai

Mark Brown wrote:

git version 1.7.9.rc2
% git pull git://git.kernel.org/pub/scm/kernel/git/broonie/regmap.git topic/patch
fatal: The remote end hung up unexpectedly

Typo in the URL, should be:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git topic/patch

It pulled now, but topic/patch branch was picked up instead of tag. It doesn't look like a good idea to have the same name for both.

Takashi