Skip to contentSkip to conversation

omap fixes for 2.6.33-rc3

GIT PULL Tony Lindgren 4 participants 10 messages Jan 8, 2010 – Jan 9, 2010

lore
Share & tools
lore

Tony Lindgren

author
#0 lore raw

Linus,

Please pull omap fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

Regards,

Tony

The following changes since commit 74d2e4f8d79ae0c4b6ec027958d5b18058662eea:
Linus Torvalds (1):

        Linux 2.6.33-rc3

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

Abhijit Pagare (2):
ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.
ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.

Alexander Shishkin (1):
omap2/3: make serial_in_override() address the right uart port

Cory Maccarrone (5):
OMAP1 clock: Add missing clocks for OMAP 7xx
OMAP1 clock: Add missing clocks for OMAP 7xx
OMAP1 clock: remove __initdata from struct clk_functions to prevent crash
omap: gpio: Simultaneously requested rising and falling edge
omap1: Add 7xx clocks and pin muxes for SPI

Felipe Balbi (1):
OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled

Huang Weiyi (2):
OMAP2: remove duplicated #include
OMAP2: remove duplicated #include

Janusz Krzysztofik (1):
omap: McBSP: Fix possible port lockout

Kevin Hilman (2):
OMAP3: clock: add clockdomains for UART1 & 2
OMAP3: clock: add clockdomains for UART1 & 2

Paul Walmsley (11):
OMAP2xxx IO mapping: mark DSP mappings as being 2420-only
OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK OMAP clock: remove incorrect EXPORT_SYMBOL()s
OMAP2xxx IO mapping: mark DSP mappings as being 2420-only
OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK OMAP clock: remove incorrect EXPORT_SYMBOL()s
OMAP2xxx OPP: clean up comments in OPP data
OMAP clock/CPUFreq: add clk_exit_cpufreq_table()
OMAP2 clock: dynamically allocate CPUFreq frequency table

Roel Kluin (3):
omap: &&/|| confusion in iommu_put()
omap3: add missing parentheses
omap3: add missing parentheses

Tony Lindgren (5):
Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2.6.33-rc3 Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
omap: Remove uninitialized warning for gpio.c
omap1: Fix compile for omap1_bl.c
omap3: Fix booting if package is uninitialized

Tuukka Toivonen (2):
OMAP3 clock: Add capability to change rate of dpll4_m5_ck OMAP3 clock: Add capability to change rate of dpll4_m5_ck

Vaibhav Hiremath (1):
omap3: EVM: Choose OMAP_PACKAGE_CBB

Vimal Singh (1):
omap2/3: ZOOM: Correcting key mapping for few keys

 arch/arm/mach-omap1/clock_data.c             |   10 +++-
 arch/arm/mach-omap1/devices.c                |   35 ++++++++++++++
 arch/arm/mach-omap1/mux.c                    |    8 +++
 arch/arm/mach-omap2/Kconfig                  |    1 +
 arch/arm/mach-omap2/board-zoom-peripherals.c |    8 ++--
 arch/arm/mach-omap2/clock2xxx.c              |   57 +++++++++++++++++++----
 arch/arm/mach-omap2/clock34xx.c              |    1 -
 arch/arm/mach-omap2/clock34xx_data.c         |    6 ++-
 arch/arm/mach-omap2/clockdomain.c            |    4 +-
 arch/arm/mach-omap2/io.c                     |   19 ++++----
 arch/arm/mach-omap2/mux.c                    |    6 ++-
 arch/arm/mach-omap2/opp2420_data.c           |   38 ++++++++-------
 arch/arm/mach-omap2/opp2430_data.c           |   30 ++++++------
 arch/arm/mach-omap2/pm34xx.c                 |    4 +-
 arch/arm/mach-omap2/serial.c                 |   12 ++++-
 arch/arm/plat-omap/clock.c                   |   16 ++++---
 arch/arm/plat-omap/cpu-omap.c                |    1 +
 arch/arm/plat-omap/gpio.c                    |   63 +++++++++++++++++++++++++-
 arch/arm/plat-omap/include/plat/board.h      |    1 -
 arch/arm/plat-omap/include/plat/clock.h      |    2 +
 arch/arm/plat-omap/include/plat/control.h    |    2 +-
 arch/arm/plat-omap/include/plat/io.h         |   36 +++++++--------
 arch/arm/plat-omap/include/plat/mux.h        |    8 +++
 arch/arm/plat-omap/include/plat/omap7xx.h    |    3 +
 arch/arm/plat-omap/io.c                      |   12 +++---
 arch/arm/plat-omap/iommu.c                   |    2 +-
 arch/arm/plat-omap/mcbsp.c                   |   20 +++++++-
 drivers/video/backlight/omap1_bl.c           |    2 -
 28 files changed, 296 insertions(+), 111 deletions(-)
#1 lore raw
Quoted 4 lines · Tony Lindgren

Please pull omap fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

No.

I don't know what the *** people have been doing in that tree, but it looks like the _same_ branch was merged twice after rebasing:

	Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2.6.33-rc3
	Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus

This is why we don't rebase public trees, and I refuse to pull crap like that. You need to teach the people you work with to not rebase, and the only way I can say "stop" is by simply not pulling the crap.

There are other problems with that branch too - the "committer" information is pure sh*t. It says "paul <paul@twilight.(none)>", so quite frankly, somebody hasn't even read the very first chapter of just about every single git documentation that is out there.

And now that I noticed, I see that the crap-for-brains committer info has been going on for a long time, and I just hadn't looked closely enough before. I didn't look closely enough to see if the rebase problem had also happened before.

Linus

author
#2 lore raw
Quoted 25 lines · Linus Torvalds
Quoted 4 lines · Tony Lindgren

Please pull omap fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

No.

I don't know what the *** people have been doing in that tree, but it looks like the _same_ branch was merged twice after rebasing:

	Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2.6.33-rc3
	Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus

This is why we don't rebase public trees, and I refuse to pull crap like that. You need to teach the people you work with to not rebase, and the only way I can say "stop" is by simply not pulling the crap.

There are other problems with that branch too - the "committer" information is pure sh*t. It says "paul <paul@twilight.(none)>", so quite frankly, somebody hasn't even read the very first chapter of just about every single git documentation that is out there.

Quoted 4 lines

And now that I noticed, I see that the crap-for-brains committer info has been going on for a long time, and I just hadn't looked closely enough before. I didn't look closely enough to see if the rebase problem had also happened before.

Yeah sorry, noticed the duplicate mess too. Will look into it.

Regards,

Tony

#3 lore raw

Hello Linus, Tony,

Quoted 11 lines · Tony Lindgren
Quoted 10 lines · Linus Torvalds

There are other problems with that branch too - the "committer" information is pure sh*t. It says "paul <paul@twilight.(none)>", so quite frankly, somebody hasn't even read the very first chapter of just about every single git documentation that is out there.

And now that I noticed, I see that the crap-for-brains committer info has been going on for a long time, and I just hadn't looked closely enough before. I didn't look closely enough to see if the rebase problem had also happened before.

Sorry - I seem to be the crap-for-brains committer. Will fix -

- Paul

author
#4 lore raw
Quoted 11 lines · Paul Walmsley

Hello Linus, Tony,

Quoted 7 lines · Tony Lindgren
Quoted 6 lines · Linus Torvalds

There are other problems with that branch too - the "committer" information is pure sh*t. It says "paul <paul@twilight.(none)>", so quite frankly, somebody hasn't even read the very first chapter of just about every single git documentation that is out there.

Quoted 6 lines
Quoted 4 lines
Quoted 4 lines

And now that I noticed, I see that the crap-for-brains committer info has been going on for a long time, and I just hadn't looked closely enough before. I didn't look closely enough to see if the rebase problem had also happened before.

Sorry - I seem to be the crap-for-brains committer. Will fix -

Here's a check for unconfigured GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL:

$ git log --pretty=oneline --author=".(none)" --committer=".(none)" v2.6.33-rc1..

If it returns results, something is wrong.

Should we have some check like this in place for all pulls?

Regards,

Tony

#5 lore raw
Quoted 2 lines · Tony Lindgren
$ git log --pretty=oneline --author=".(none)" --committer=".(none)" v2.6.33-rc1..

Well, that will catch one particular common case of it, but..

Quoted 1 line

Should we have some check like this in place for all pulls?

.. it would probably make more sense to warn about it earlier in the chain, so that people with bad configurations can fix them. By the time somebody pulls, it's pretty late in the game.

Sadly, git doesn't do any real sanity checking, and now it's pretty much too late. It takes about a year or two for new git versions to percolate out, with things like Debian-stable etc, so making git warn about suspicious-looking names is not necessarily going to help (and with scripting and importing from other SCM's, it may be wrong to warn in general).

It's _fairly_ easy to set up a hook at commit-time to check for random thigns, but obviously if the problem is that people haven't configured their git setup, then "add a hook" is not going to work. In that sense, pull-time may be better, as a way to see it automatically after-the-fact.

Doing a post-merge hook would catch it, and could be used to warn about the fact that you merged something odd.

Linus

author
#6 lore raw
Quoted 14 lines · Linus Torvalds
Quoted 2 lines · Tony Lindgren
$ git log --pretty=oneline --author=".(none)" --committer=".(none)" v2.6.33-rc1..

Well, that will catch one particular common case of it, but..

Quoted 1 line

Should we have some check like this in place for all pulls?

.. it would probably make more sense to warn about it earlier in the chain, so that people with bad configurations can fix them. By the time somebody pulls, it's pretty late in the game.

Quoted 6 lines

Sadly, git doesn't do any real sanity checking, and now it's pretty much too late. It takes about a year or two for new git versions to percolate out, with things like Debian-stable etc, so making git warn about suspicious-looking names is not necessarily going to help (and with scripting and importing from other SCM's, it may be wrong to warn in general).

Yeah..

Quoted 7 lines

It's _fairly_ easy to set up a hook at commit-time to check for random thigns, but obviously if the problem is that people haven't configured their git setup, then "add a hook" is not going to work. In that sense, pull-time may be better, as a way to see it automatically after-the-fact.

Doing a post-merge hook would catch it, and could be used to warn about the fact that you merged something odd.

Hmm, sounds like it might make sense to check for that in Stephen's for-next tree then. Added Stephen to the loop, let's see if what he thinks.

Regards,

Tony

#7 lore raw

Hi Tony,

Quoted 4 lines · On Fri, 8 Jan 2010 14:50:23 -0800 Tony Lindgren <[email protected]> wrote:

Hmm, sounds like it might make sense to check for that in Stephen's for-next tree then. Added Stephen to the loop, let's see if what he thinks.

I can certainly add hooks to my tree if someone can suggest what should be in them (I didn't get enough context here ...). That way I could send the tree maintainer a warning email letting them know something is fishy ...

Of course, this only helps those who don't mind rebasing their trees, right? The non-rebasing tree maintainers should do these checks themselves. Maybe we could propogate a suggested (or mandatory) set of hooks?

Signature · 10 lines
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100109/a58dc3e4/attachment.sig>
author
#8 lore raw
Quoted 4 lines · Stephen Rothwell

Hi Tony,

Quoted 1 line · On Fri, 8 Jan 2010 14:50:23 -0800 Tony Lindgren <[email protected]> wrote:
Quoted 8 lines
Quoted 3 lines

Hmm, sounds like it might make sense to check for that in Stephen's for-next tree then. Added Stephen to the loop, let's see if what he thinks.

I can certainly add hooks to my tree if someone can suggest what should be in them (I didn't get enough context here ...). That way I could send the tree maintainer a warning email letting them know something is fishy ...

Just trying to warn about unconfigured environment for GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL that makes commits show from user at hostname.(none). There are quite a few of them, but looks like none after v2.6.33-rc1.

So I guess the test would be to do a pull into for-next, then do a git log of the pull to see if there were any unconfigured email addresses. Then notify the maintainers if there were .(none) type email addresses.

The git commands to test for these would be something like this:

ORIG=$(git log --pretty=format:"%H" -n1)
git pull whatevever
...
git log --pretty=format:"Bad author: %H %ae" --author=".(none)" $ORIG..HEAD git log --pretty=format:"Bad committer: %H %ce" --committer=".(none)" $ORIG..HEAD

Quoted 4 lines

Of course, this only helps those who don't mind rebasing their trees, right? The non-rebasing tree maintainers should do these checks themselves. Maybe we could propogate a suggested (or mandatory) set of hooks?

Right, this won't catch all of them, and might be too late in many cases to fix the issue. But just letting the maintainers know about issues might be enough to fix the problem.

Regards,

Tony

author
#9 lore raw
In reply to Tony Lindgren
Quoted 5 lines · Tony Lindgren

Linus,

Please pull omap fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

Oops, please dont, let me first check what's up with the duplicate commits first.

Regards,

Tony

Quoted 109 lines

Regards,

Tony

The following changes since commit 74d2e4f8d79ae0c4b6ec027958d5b18058662eea:
Linus Torvalds (1):

        Linux 2.6.33-rc3

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

Abhijit Pagare (2):
ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.
ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.

Alexander Shishkin (1):
omap2/3: make serial_in_override() address the right uart port

Cory Maccarrone (5):
OMAP1 clock: Add missing clocks for OMAP 7xx
OMAP1 clock: Add missing clocks for OMAP 7xx
OMAP1 clock: remove __initdata from struct clk_functions to prevent crash
omap: gpio: Simultaneously requested rising and falling edge
omap1: Add 7xx clocks and pin muxes for SPI

Felipe Balbi (1):
OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled

Huang Weiyi (2):
OMAP2: remove duplicated #include
OMAP2: remove duplicated #include

Janusz Krzysztofik (1):
omap: McBSP: Fix possible port lockout

Kevin Hilman (2):
OMAP3: clock: add clockdomains for UART1 & 2
OMAP3: clock: add clockdomains for UART1 & 2

Paul Walmsley (11):
OMAP2xxx IO mapping: mark DSP mappings as being 2420-only
OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK OMAP clock: remove incorrect EXPORT_SYMBOL()s
OMAP2xxx IO mapping: mark DSP mappings as being 2420-only
OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK OMAP clock: remove incorrect EXPORT_SYMBOL()s
OMAP2xxx OPP: clean up comments in OPP data
OMAP clock/CPUFreq: add clk_exit_cpufreq_table()
OMAP2 clock: dynamically allocate CPUFreq frequency table

Roel Kluin (3):
omap: &&/|| confusion in iommu_put()
omap3: add missing parentheses
omap3: add missing parentheses

Tony Lindgren (5):
Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2.6.33-rc3 Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
omap: Remove uninitialized warning for gpio.c
omap1: Fix compile for omap1_bl.c
omap3: Fix booting if package is uninitialized

Tuukka Toivonen (2):
OMAP3 clock: Add capability to change rate of dpll4_m5_ck OMAP3 clock: Add capability to change rate of dpll4_m5_ck

Vaibhav Hiremath (1):
omap3: EVM: Choose OMAP_PACKAGE_CBB

Vimal Singh (1):
omap2/3: ZOOM: Correcting key mapping for few keys

 arch/arm/mach-omap1/clock_data.c             |   10 +++-
 arch/arm/mach-omap1/devices.c                |   35 ++++++++++++++
 arch/arm/mach-omap1/mux.c                    |    8 +++
 arch/arm/mach-omap2/Kconfig                  |    1 +
 arch/arm/mach-omap2/board-zoom-peripherals.c |    8 ++--
 arch/arm/mach-omap2/clock2xxx.c              |   57 +++++++++++++++++++----
 arch/arm/mach-omap2/clock34xx.c              |    1 -
 arch/arm/mach-omap2/clock34xx_data.c         |    6 ++-
 arch/arm/mach-omap2/clockdomain.c            |    4 +-
 arch/arm/mach-omap2/io.c                     |   19 ++++----
 arch/arm/mach-omap2/mux.c                    |    6 ++-
 arch/arm/mach-omap2/opp2420_data.c           |   38 ++++++++-------
 arch/arm/mach-omap2/opp2430_data.c           |   30 ++++++------
 arch/arm/mach-omap2/pm34xx.c                 |    4 +-
 arch/arm/mach-omap2/serial.c                 |   12 ++++-
 arch/arm/plat-omap/clock.c                   |   16 ++++---
 arch/arm/plat-omap/cpu-omap.c                |    1 +
 arch/arm/plat-omap/gpio.c                    |   63 +++++++++++++++++++++++++-
 arch/arm/plat-omap/include/plat/board.h      |    1 -
 arch/arm/plat-omap/include/plat/clock.h      |    2 +
 arch/arm/plat-omap/include/plat/control.h    |    2 +-
 arch/arm/plat-omap/include/plat/io.h         |   36 +++++++--------
 arch/arm/plat-omap/include/plat/mux.h        |    8 +++
 arch/arm/plat-omap/include/plat/omap7xx.h    |    3 +
 arch/arm/plat-omap/io.c                      |   12 +++---
 arch/arm/plat-omap/iommu.c                   |    2 +-
 arch/arm/plat-omap/mcbsp.c                   |   20 +++++++-
 drivers/video/backlight/omap1_bl.c           |    2 -
 28 files changed, 296 insertions(+), 111 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html