2009-03-10 23:58:30

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: [git pull] Please pull powerpc.git merge branch

Hi Linus !

Here are some late fixes for 2.6.29. I've included a radeonfb/aty128fb commit
as it only affects a powerpc specific code path and solves a reported regression.
There's also an hvc_console commit that only affects powerpc pseries backends,
and also solves a regression. The rest are defconfig fixes and removing some
obsolete and non-building code from a pair of embedded platforms.

Cheers,
Ben.

The following changes since commit 99adcd9d67aaf04e28f5ae96df280f236bde4b66:
Linus Torvalds (1):
Merge branch 'fixes' of git://git.kernel.org/.../davej/cpufreq

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Benjamin Herrenschmidt (3):
Merge commit 'gcl/merge' into merge
hvc_console: Remove tty->low_latency on pseries backends
radeonfb/aty128fb: Disable broken early resume hook for PowerBooks

Grant Likely (1):
powerpc/4xx: Enable SERIAL_OF support by default for Virtex platforms

Guennadi Liakhovetski (1):
powerpc: fix linkstation and storcenter compilation breakage

arch/powerpc/configs/40x/virtex_defconfig | 2 +-
arch/powerpc/configs/44x/virtex5_defconfig | 2 +-
arch/powerpc/configs/linkstation_defconfig | 36 ++++++++++++--------
arch/powerpc/configs/storcenter_defconfig | 35 ++++++++++++-------
arch/powerpc/platforms/embedded6xx/linkstation.c | 38 ----------------------
arch/powerpc/platforms/embedded6xx/storcenter.c | 32 ------------------
drivers/char/hvcs.c | 9 -----
drivers/char/hvsi.c | 1 -
drivers/video/aty/aty128fb.c | 10 +++++-
drivers/video/aty/radeon_pm.c | 10 +++++-
10 files changed, 64 insertions(+), 111 deletions(-)


2009-03-11 09:38:19

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [git pull] Please pull powerpc.git merge branch

On Wed, 11 Mar 2009, Benjamin Herrenschmidt wrote:
> Here are some late fixes for 2.6.29. I've included a radeonfb/aty128fb commit

Will you also take care of the new ps3vram driver, which has been ack'ed by
Jens for 2.6.29?
Or do you prefer it to go in by email through Geoff (as PS3 maintainer), or
from me directly?

Thanks!

With kind regards,

Geert Uytterhoeven
Software Architect

Sony Techsoft Centre Europe
The Corporate Village ? Da Vincilaan 7-D1 ? B-1935 Zaventem ? Belgium

Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: [email protected]
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 ? RPR Brussels
Fortis ? BIC GEBABEBB ? IBAN BE41293037680010

2009-03-11 10:58:46

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: [git pull] Please pull powerpc.git merge branch

On Wed, 2009-03-11 at 10:37 +0100, Geert Uytterhoeven wrote:
> On Wed, 11 Mar 2009, Benjamin Herrenschmidt wrote:
> > Here are some late fixes for 2.6.29. I've included a radeonfb/aty128fb commit
>
> Will you also take care of the new ps3vram driver, which has been ack'ed by
> Jens for 2.6.29?
> Or do you prefer it to go in by email through Geoff (as PS3 maintainer), or
> from me directly?

I'd like to have Andrew or Linus opinion on doing this driver swap that
late in the process.

Ben.

> Thanks!
>
> With kind regards,
>
> Geert Uytterhoeven
> Software Architect
>
> Sony Techsoft Centre Europe
> The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
>
> Phone: +32 (0)2 700 8453
> Fax: +32 (0)2 700 8622
> E-mail: [email protected]
> Internet: http://www.sony-europe.com/
>
> A division of Sony Europe (Belgium) N.V.
> VAT BE 0413.825.160 · RPR Brussels
> Fortis · BIC GEBABEBB · IBAN BE41293037680010

2009-03-11 15:38:08

by Linus Torvalds

[permalink] [raw]
Subject: Re: [git pull] Please pull powerpc.git merge branch



On Wed, 11 Mar 2009, Benjamin Herrenschmidt wrote:
>
> I'd like to have Andrew or Linus opinion on doing this driver swap that
> late in the process.

Quite franklly, no.

If it was a totally _new_ driver, there's no chance of regression, which
is why we allow those drivers.

But switching an old one for a new one does not match that pattern. We can
clearly get regressions. As such, we don't do it late in the -rc series.

Linus

2009-03-11 15:53:46

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [git pull] Please pull powerpc.git merge branch

Hi Linus,

On Wed, 11 Mar 2009, Linus Torvalds wrote:
> On Wed, 11 Mar 2009, Benjamin Herrenschmidt wrote:
> > I'd like to have Andrew or Linus opinion on doing this driver swap that
> > late in the process.
>
> Quite franklly, no.
>
> If it was a totally _new_ driver, there's no chance of regression, which
> is why we allow those drivers.
>
> But switching an old one for a new one does not match that pattern. We can
> clearly get regressions. As such, we don't do it late in the -rc series.

Are you aware the old one was introduced in 2.6.29-rc1? So there cannot be a
regression from 2.6.28 or older.

Thanks!

With kind regards,

Geert Uytterhoeven
Software Architect

Sony Techsoft Centre Europe
The Corporate Village ? Da Vincilaan 7-D1 ? B-1935 Zaventem ? Belgium

Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: [email protected]
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 ? RPR Brussels
Fortis ? BIC GEBABEBB ? IBAN BE41293037680010

2009-03-11 19:20:49

by Linus Torvalds

[permalink] [raw]
Subject: Re: [git pull] Please pull powerpc.git merge branch



On Wed, 11 Mar 2009, Geert Uytterhoeven wrote:
>
> Are you aware the old one was introduced in 2.6.29-rc1? So there cannot be a
> regression from 2.6.28 or older.

Ahh, no, that part hadn't registered.

In that case, I guess I don't really care, as long as everybody involved
feels it's clearly better than the one merged into -rc1.

Linus