mbox

[GIT,PULL] Borderline fixes for v3.2-rc6

Message ID 20111219194249.GO6464@atomide.com
State New
Headers show

Pull-request

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

Message

Tony Lindgren Dec. 19, 2011, 7:42 p.m. UTC
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(-)

Comments

Olof Johansson Dec. 20, 2011, 4:52 a.m. UTC | #1
Hi Tony,

On Mon, Dec 19, 2011 at 11:42 AM, Tony Lindgren <tony@atomide.com> wrote:
> 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