Please pull powerpc.git 'merge' branch

4 messages, 3 authors, 2006-12-20 · open the first message on its own page

Please pull powerpc.git 'merge' branch

From: Paul Mackerras <hidden>
Date: 2006-12-20 10:23:29

Linus,

Please do:

git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

or, if the mirroring hasn't caught up:

git pull \
master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git merge

to get some bug fixes for powerpc, plus a documentation update and a
defconfig update, as listed below.

Thanks,
Paul.

 Documentation/powerpc/booting-without-of.txt |   19 +
 arch/powerpc/boot/Makefile                   |    3 
 arch/powerpc/configs/cell_defconfig          |  358 +++++++++++++++++++++++---
 arch/powerpc/kernel/of_platform.c            |    1 
 arch/powerpc/kernel/pci_64.c                 |    1 
 arch/powerpc/kernel/prom_parse.c             |   15 +
 arch/powerpc/kernel/signal_32.c              |   16 +
 arch/powerpc/platforms/Makefile              |    2 
 arch/powerpc/platforms/cell/io-workarounds.c |    2 
 arch/powerpc/platforms/cell/spu_priv1_mmio.c |   95 ++++---
 arch/powerpc/platforms/iseries/Kconfig       |    2 
 drivers/block/viodasd.c                      |    6 
 drivers/cdrom/viocd.c                        |    4 
 drivers/char/viocons.c                       |    7 +
 drivers/char/viotape.c                       |    5 
 drivers/net/iseries_veth.c                   |    9 -
 include/asm-powerpc/spu.h                    |    2 
 17 files changed, 441 insertions(+), 106 deletions(-)

Arnd Bergmann (4):
      [POWERPC] cell: update cell_defconfig
      [POWERPC] cell: add forward struct declarations to spu.h
      [POWERPC] spufs: fix assignment of node numbers
      [POWERPC] powerpc: add scanning of ebc bus to of_platform

Benjamin Herrenschmidt (3):
      [POWERPC] cell: Fix spufs with "new style" device-tree
      [POWERPC] Workaround oldworld OF bug with IRQs & P2P bridges
      [POWERPC] Fix build of cell zImage.initrd

David Woodhouse (1):
      [POWERPC] Probe Efika platform before CHRP.

Jens Osterkamp (1):
      [POWERPC] cell: Enable spider workarounds on all PCI buses

Linas Vepstas (1):
      [POWERPC] Fix PCI device channel state initialization

Paul Mackerras (1):
      [POWERPC] Fix register save area alignment for swapcontext syscall

Stephen Rothwell (6):
      [POWERPC] iSeries: fix viodasd init
      [POWERPC] iSeries: fix viotape init
      [POWERPC] iSeries: fix iseries_veth init
      [POWERPC] iSeries: fix viocd init
      [POWERPC] iSeries: fix viocons init
      [POWERPC] iSeries: fix CONFIG_VIOPATH dependency

Vitaly Wool (1):
      [POWERPC] Update MTD OF documentation

Re: Please pull powerpc.git 'merge' branch

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2006-12-20 10:52:41

Jens Osterkamp (1):
      [POWERPC] cell: Enable spider workarounds on all PCI buses
That one isn't totally correct I think, but it can go in, it won't harm,
it's just that the PCIe busses on the spider chip might need a slightly
different workaround. I'll send a separate patch on top of this one to
fix it.

Ben.

Re: Please pull powerpc.git 'merge' branch

From: Arnd Bergmann <arnd@arndb.de>
Date: 2006-12-20 11:16:23

On Wednesday 20 December 2006 11:52, Benjamin Herrenschmidt wrote:
=20
quoted
Jens Osterkamp (1):
=A0 =A0 =A0 [POWERPC] cell: Enable spider workarounds on all PCI buses
=20
That one isn't totally correct I think, but it can go in, it won't harm,
it's just that the PCIe busses on the spider chip might need a slightly
different workaround. I'll send a separate patch on top of this one to
fix it.
Thanks. I thought that a fix for the PCIe bus had already gone in.
Once you have done it, Jens' patch will be the the right one.

	Arnd <><

Re: Please pull powerpc.git 'merge' branch

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2006-12-20 11:19:21

On Wed, 2006-12-20 at 12:15 +0100, Arnd Bergmann wrote:
On Wednesday 20 December 2006 11:52, Benjamin Herrenschmidt wrote:
quoted
quoted
Jens Osterkamp (1):
      [POWERPC] cell: Enable spider workarounds on all PCI buses
That one isn't totally correct I think, but it can go in, it won't harm,
it's just that the PCIe busses on the spider chip might need a slightly
different workaround. I'll send a separate patch on top of this one to
fix it.
Thanks. I thought that a fix for the PCIe bus had already gone in.
Once you have done it, Jens' patch will be the the right one.
Got distracted with getting the EMAC driver in shape for CAB, took me a
tad longer than expected (maybe I wasn't very motivated :-)

Ben.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help