Skip to contentSkip to conversation

Borderline fixes for v3.2-rc6

GIT PULL Tony Lindgren 2 participants 7 messages Dec 19, 2011 – Dec 22, 2011

lore
Share & tools
lore
#0 lore raw

Hi Arnd & Olof,

Here are two fixes that could potentially go into v3.2 -rc cycle.

One fixes a harmless but annoying warning that happens on omap 34xx processors during boot. The other one fixes booting on pretty rare secure mode development board, but that's fixed in "features that never worked earlier either" style.

We can surely wait on these fixes, but if you have something going upstream anyways, then these might be worth considering too.

I'll post a following pull request for fixes-non-critical-part2 that is based on this one, so no need to pull in this one in case you're not sending any more fixes for the -rc cycle:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes-hwmod

Regards,

Tony

The following changes since commit e5fe29c7198a1f6616286dfc8602a69da165cb3f:
Felipe Contreras (1):
ARM: OMAP: rx51: fix USB

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes-hwmod

Aaro Koskinen (1):
ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot

Felipe Contreras (1):
ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3

Tony Lindgren (1):
Merge branch 'hwmod_data_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-hwmod

 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
#1 lore raw

Hi Tony,

Quoted 11 lines · Tony Lindgren

Hi Arnd & Olof,

Here are two fixes that could potentially go into v3.2 -rc cycle.

One fixes a harmless but annoying warning that happens on omap 34xx processors during boot. The other one fixes booting on pretty rare secure mode development board, but that's fixed in "features that never worked earlier either" style.

We can surely wait on these fixes, but if you have something going upstream anyways, then these might be worth considering too.

The hwmod patch is a regression so that one I'll take, the other one is a little less obvious that it should go in now. Also, shouldn't it be cc:d stable in that case?

Let me know what you prefer (rebase with a cc: stable) or take out the secure mode patch. I'm collecting a small series of fixes so I'll pull it in tomorrow for that.

-Olof

#2 lore raw
Quoted 12 lines · Olof Johansson

Hi Tony,

Quoted 9 lines · Tony Lindgren

Hi Arnd & Olof,

Here are two fixes that could potentially go into v3.2 -rc cycle.

One fixes a harmless but annoying warning that happens on omap 34xx processors during boot. The other one fixes booting on pretty rare secure mode development board, but that's fixed in "features that never worked earlier either" style.

Quoted 6 lines
Quoted 2 lines

We can surely wait on these fixes, but if you have something going upstream anyways, then these might be worth considering too.

The hwmod patch is a regression so that one I'll take, the other one is a little less obvious that it should go in now. Also, shouldn't it be cc:d stable in that case?

Yes let's not worry about the second one, it adds new functionality and it's for a currently rare case.

Quoted 3 lines

Let me know what you prefer (rebase with a cc: stable) or take out the secure mode patch. I'm collecting a small series of fixes so I'll pull it in tomorrow for that.

I've branched it out into fixes-hwmod-regression with just that same commit in it. The second patch in this series will be pulled in with fixes-non-critical-part2. Updated pull request below.

Regards,

Tony

The following changes since commit e5fe29c7198a1f6616286dfc8602a69da165cb3f:
Felipe Contreras (1):
ARM: OMAP: rx51: fix USB

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes-hwmod-regression

Felipe Contreras (1):
ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3

 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
#3 lore raw
Quoted 23 lines · Tony Lindgren
Quoted 12 lines · Olof Johansson

Hi Tony,

Quoted 9 lines · Tony Lindgren

Hi Arnd & Olof,

Here are two fixes that could potentially go into v3.2 -rc cycle.

One fixes a harmless but annoying warning that happens on omap 34xx processors during boot. The other one fixes booting on pretty rare secure mode development board, but that's fixed in "features that never worked earlier either" style.

Quoted 6 lines
Quoted 2 lines

We can surely wait on these fixes, but if you have something going upstream anyways, then these might be worth considering too.

The hwmod patch is a regression so that one I'll take, the other one is a little less obvious that it should go in now. Also, shouldn't it be cc:d stable in that case?

Yes let's not worry about the second one, it adds new functionality and it's for a currently rare case.

Quoted 7 lines
Quoted 3 lines

Let me know what you prefer (rebase with a cc: stable) or take out the secure mode patch. I'm collecting a small series of fixes so I'll pull it in tomorrow for that.

I've branched it out into fixes-hwmod-regression with just that same commit in it. The second patch in this series will be pulled in with fixes-non-critical-part2. Updated pull request below.

Thanks, I pulled fixes-hwmod-regression into fixes and fixes-hwmod into next/fixes-non-critical.

-Olof

#4 lore raw

Hi Olof,

Quoted 8 lines · Olof Johansson
Quoted 4 lines · Tony Lindgren

I've branched it out into fixes-hwmod-regression with just that same commit in it. The second patch in this series will be pulled in with fixes-non-critical-part2. Updated pull request below.

Thanks, I pulled fixes-hwmod-regression into fixes and fixes-hwmod into next/fixes-non-critical.

Just checking.. Looks like you pulled fixes-hwmod into a new branch named fixes-non-critical-part2, but did not pull the same name branch fixes-non-critical-part2 that I posted?

That's this pull request:

http://www.spinics.net/lists/linux-omap/msg62050.html

Regards,

Tony

#5 lore raw
Quoted 12 lines · Tony Lindgren

Hi Olof,

Quoted 8 lines · Olof Johansson
Quoted 4 lines · Tony Lindgren

I've branched it out into fixes-hwmod-regression with just that same commit in it. The second patch in this series will be pulled in with fixes-non-critical-part2. Updated pull request below.

Thanks, I pulled fixes-hwmod-regression into fixes and fixes-hwmod into next/fixes-non-critical.

Quoted 7 lines

Just checking.. Looks like you pulled fixes-hwmod into a new branch named fixes-non-critical-part2, but did not pull the same name branch fixes-non-critical-part2 that I posted?

That's this pull request:

http://www.spinics.net/lists/linux-omap/msg62050.html

Grmbl, thanks for catching that. I'll sort it out at this end.

-Olof

#6 lore raw
Quoted 17 lines · Olof Johansson
Quoted 16 lines · Tony Lindgren

Hi Olof,

Quoted 8 lines · Olof Johansson
Quoted 4 lines · Tony Lindgren

I've branched it out into fixes-hwmod-regression with just that same commit in it. The second patch in this series will be pulled in with fixes-non-critical-part2. Updated pull request below.

Thanks, I pulled fixes-hwmod-regression into fixes and fixes-hwmod into next/fixes-non-critical.

Just checking.. Looks like you pulled fixes-hwmod into a new branch named fixes-non-critical-part2, but did not pull the same name branch fixes-non-critical-part2 that I posted?

Quoted 5 lines
Quoted 3 lines

That's this pull request:

http://www.spinics.net/lists/linux-omap/msg62050.html

Grmbl, thanks for catching that. I'll sort it out at this end.

OK thanks!

Tony