mbox

[GIT,PULL] Two ux500 fixes for the v3.10 series

Message ID CACRpkdYeWi2cx2weXao9=2f78eM0_J=gK-8o6gKjcG7pjYFAxA@mail.gmail.com
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git

Message

Linus Walleij May 3, 2013, 7:04 p.m. UTC
Hi ARM SoC folks,

here are two ux500 fixes for the v3.10 series, please pull
them in. Since -rc1 is not out this is based on Torvald's
HEAD from yesterday.

Yours,
Linus Walleij

The following changes since commit ce857229e0c3adc211944a13a5579ef84fd7b4af:

  ipc: fix GETALL/IPC_RM race for sysv semaphores (2013-05-02 19:51:31 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
tags/ux500-fixes-for-v3.10-1

for you to fetch changes up to 9b7a2104e7e5dd02210ac26f5dc488ceb29778f7:

  ARM: ux500: Rid ignored return value of regulator_enable() compiler
warning (2013-05-03 10:27:12 +0200)

----------------------------------------------------------------
Two ux500 fixes for the v3.10 series:
- SoC ID fix
- Fix errorpath for proximity regulator

----------------------------------------------------------------
Fabio Baltieri (1):
      ARM: ux500: read the correct soc_id number

Lee Jones (1):
      ARM: ux500: Rid ignored return value of regulator_enable()
compiler warning

 arch/arm/mach-ux500/board-mop500.c | 4 ++--
 arch/arm/mach-ux500/cpu-db8500.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Arnd Bergmann May 3, 2013, 8:40 p.m. UTC | #1
On Friday 03 May 2013, Linus Walleij wrote:
> Hi ARM SoC folks,
> 
> here are two ux500 fixes for the v3.10 series, please pull
> them in. Since -rc1 is not out this is based on Torvald's
> HEAD from yesterday.

We try hard to avoid doing bug fixes on top of random HEADs.
Can you send these on top of the minimum set of branches?

	Arnd
Linus Walleij May 3, 2013, 8:43 p.m. UTC | #2
On Fri, May 3, 2013 at 10:40 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Friday 03 May 2013, Linus Walleij wrote:
>> Hi ARM SoC folks,
>>
>> here are two ux500 fixes for the v3.10 series, please pull
>> them in. Since -rc1 is not out this is based on Torvald's
>> HEAD from yesterday.
>
> We try hard to avoid doing bug fixes on top of random HEADs.
> Can you send these on top of the minimum set of branches?

I think I'll just wait for -rc1.

It's not *that* urgent, just wanted to clean my desk.

Yours,
Linus Walleij
Arnd Bergmann May 3, 2013, 8:47 p.m. UTC | #3
On Friday 03 May 2013 22:43:10 Linus Walleij wrote:
> On Fri, May 3, 2013 at 10:40 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Friday 03 May 2013, Linus Walleij wrote:
> >> Hi ARM SoC folks,
> >>
> >> here are two ux500 fixes for the v3.10 series, please pull
> >> them in. Since -rc1 is not out this is based on Torvald's
> >> HEAD from yesterday.
> >
> > We try hard to avoid doing bug fixes on top of random HEADs.
> > Can you send these on top of the minimum set of branches?
> 
> I think I'll just wait for -rc1.
> 
> It's not *that* urgent, just wanted to clean my desk.

Ok, sounds good.

	Arnd
Olof Johansson May 9, 2013, 8:11 p.m. UTC | #4
On Fri, May 03, 2013 at 10:43:10PM +0200, Linus Walleij wrote:
> On Fri, May 3, 2013 at 10:40 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Friday 03 May 2013, Linus Walleij wrote:
> >> Hi ARM SoC folks,
> >>
> >> here are two ux500 fixes for the v3.10 series, please pull
> >> them in. Since -rc1 is not out this is based on Torvald's
> >> HEAD from yesterday.
> >
> > We try hard to avoid doing bug fixes on top of random HEADs.
> > Can you send these on top of the minimum set of branches?
> 
> I think I'll just wait for -rc1.
> 
> It's not *that* urgent, just wanted to clean my desk.

I've got a branch started at a non-rc for fixes right now, since we want some
of them in before the first -rc. So I'll cherry-pick these over while I'm at
it.


-Olof