[git pull] Please pull powerpc.git merge branch

Benjamin Herrenschmidt
2011-03-09T23:56:26Z

Hi Linus !

Here's a pair of regression fixes for 2.6.38. One fixes a 2.6.37
regression (I'll send it to -stable separately) that breaks booting on
legacy iSeries, and the other one disables a newly introduced features
as it triggers nasty races in the scheduler that causes hangs and seem
to be too much to fix for this release (working with PeterZ on it).

Cheers,
Ben.

The following changes since commit a5abba989deceb731047425812d268daf7536575:

Linux 2.6.38-rc8 (2011-03-07 21:09:37 -0800)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Benjamin Herrenschmidt (2):
powerpc/iseries: Fix early init access to lppaca
powerpc/pseries: Disable VPNH feature

arch/powerpc/include/asm/lppaca.h | 16 ++++++++++++++++
arch/powerpc/kernel/paca.c | 14 --------------
arch/powerpc/mm/numa.c | 3 ++-
arch/powerpc/platforms/iseries/dt.c | 6 +++---
arch/powerpc/platforms/iseries/setup.c | 1 +
5 files changed, 22 insertions(+), 18 deletions(-)