Skip to contentSkip to conversation

Regulator update for 3.3

DISCUSSION Mark Brown 3 participants 7 messages Jan 30, 2012 – Feb 1, 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/regulator.git for-linus

for you to fetch changes up to 8a093049c604ab32d94bcc5baa24f7939d5e3f7b:

regulator: Set apply_uV only when min and max voltages are defined (2012-01-26 11:01:21 +0000)

----------------------------------------------------------------
This fixes an integration issue with the regulator device tree bindings which shook out in -rc. The bindings were overly enthusiatic when deciding to set a voltage on a regulator and would try to set zero volts on an unconfigured regulator which isn't supported.
----------------------------------------------------------------

Karol Lewandowski (1):
regulator: Set apply_uV only when min and max voltages are defined

 drivers/regulator/of_regulator.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
#1 lore raw
Quoted 4 lines · Mark Brown

are available in the git repository at:

 git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-linus

"Already up-to-date."

Forgot to push?

Linus

author
#2 lore raw
Quoted 9 lines · Linus Torvalds

On Mon, Jan 30, 2012 at 5:42 AM, Mark Brown

Quoted 3 lines

are available in the git repository at:

 git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-linus

"Already up-to-date."

Forgot to push?

Not quite, I had pushed a new signed tag but I hadn't deleted the old for-linus branch (which you had merged). Since git prefers branches to tags when pulling it was looking at the old branch and ignoring the signed tag. Should be cleaned up now, at least I deleted the branch and everything looks OK in gitweb.

I actually noticed this with some other things I was doing, what I think I want git to do when working with signed tags is allow me to have a tag with the same name as the branch and prefer the tag rather than the branch. That way I can tell people to pull from a given name and it'll do the right thing if they're using a git that understands pulling from tags or not. Either that or complain bitterly and mock me if I'm so foolish as to have a tag and branch with the same name.

#3 lore raw
Quoted 8 lines · Mark Brown
Quoted 2 lines

Forgot to push?

Not quite, I had pushed a new signed tag but I hadn't deleted the old for-linus branch (which you had merged).  Since git prefers branches to tags when pulling it was looking at the old branch and ignoring the signed tag.  Should be cleaned up now, at least I deleted the branch and everything looks OK in gitweb.

Ok. You could also have asked me to pull "tags/for-linus" to disambiguate. That has the advantage that I think it even works with older versions of git - they'll get the tag, then ignore the tag information, and do the merge of just the commit the tag points to.

Quoted 7 lines

I actually noticed this with some other things I was doing, what I think I want git to do when working with signed tags is allow me to have a tag with the same name as the branch and prefer the tag rather than the branch.  That way I can tell people to pull from a given name and it'll do the right thing if they're using a git that understands pulling from tags or not.  Either that or complain bitterly and mock me if I'm so foolish as to have a tag and branch with the same name.

I won't mock you (*this* time), but I think the "tags/for-linus" approach is better, as it should work regardless of git version.

Linus

author
#4 lore raw
Quoted 7 lines · Linus Torvalds

On Mon, Jan 30, 2012 at 9:43 AM, Mark Brown

Quoted 2 lines

tags or not.  Either that or complain bitterly and mock me if I'm so foolish as to have a tag and branch with the same name.

I won't mock you (*this* time), but I think the "tags/for-linus" approach is better, as it should work regardless of git version.

Yes, indeed - so probably git request-pull ought to just do that when working with a tag (which I guess it knows it's doing because it managed to add the information it pulled from the tag into the pull request) since it'll help with old versions and avoids confusions like this.

#5 lore raw
Quoted 4 lines · Mark Brown

Yes, indeed - so probably git request-pull ought to just do that when working with a tag (which I guess it knows it's doing because it managed to add the information it pulled from the tag into the pull request) since it'll help with old versions and avoids confusions like this.

I heard you.

I'd appreciate it if you could Bc: either myself or [email protected] next time you have improvement suggestions to Git.

Thanks.

author
#6 lore raw
Quoted 2 lines · Junio C Hamano

I'd appreciate it if you could Bc: either myself or [email protected] next time you have improvement suggestions to Git.

Yeah, I'd not done this because I'd actually pencilled some time in this weekend to make the suggestion in the form of a patch - there were a couple of other things that made me want to look at how request-pull works.