[git pull] Please pull powerpc.git merge branch

[git pull] Please pull powerpc.git merge branch

[Paul Mackerras]

Linus,

Please pull from 'merge' branch of

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

to get some bug fixes and documentation/comment updates for powerpc,
as listed below.

There is one commit there that isn't just a fix, the "Add endpoint
support to 4xx PCIe driver" one.  I think it's OK to go in because (a)
it's only adding functionality, (b) it only affects ppc4xx processors,
and (c) the 4xx maintainer (Josh Boyer) said about it: "Stefan's pci-e
endpoint driver is also included here as it is a fairly contained
change with Ben's Ack.  It should have been included in my last pull
request, but I missed it and have been out."

Thanks,
Paul.

 arch/powerpc/boot/dts/sequoia.dts            |    9 +
 arch/powerpc/kernel/btext.c                  |    1 
 arch/powerpc/kernel/cputable.c               |   53 ++++++--
 arch/powerpc/kernel/head_44x.S               |    9 +
 arch/powerpc/kernel/head_64.S                |    4 -
 arch/powerpc/kernel/isa-bridge.c             |    3 
 arch/powerpc/kernel/setup_64.c               |   10 +
 arch/powerpc/platforms/cell/interrupt.c      |   53 +++++++-
 arch/powerpc/platforms/cell/spu_base.c       |   31 +++-
 arch/powerpc/platforms/cell/spu_priv1_mmio.c |   16 ++
 arch/powerpc/platforms/cell/spufs/fault.c    |   17 ++
 arch/powerpc/platforms/cell/spufs/inode.c    |   10 +
 arch/powerpc/platforms/cell/spufs/run.c      |   38 +++--
 arch/powerpc/platforms/cell/spufs/sched.c    |    7 +
 arch/powerpc/platforms/cell/spufs/spufs.h    |    3 
 arch/powerpc/platforms/cell/spufs/switch.c   |   71 +++++++---
 arch/powerpc/sysdev/ppc4xx_pci.c             |  180 +++++++++++++++++++-------
 arch/powerpc/xmon/xmon.c                     |    6 +
 include/asm-powerpc/pgtable-ppc32.h          |    7 +
 include/asm-powerpc/spu.h                    |    9 +
 include/asm-powerpc/spu_csa.h                |    3 
 include/linux/of_i2c.h                       |    4 -
 22 files changed, 399 insertions(+), 145 deletions(-)

Benjamin Herrenschmidt (4):
      [POWERPC] Make default cputable entries reflect selected CPU family
      [POWERPC] Fix bogus paca->_current initialization
      [POWERPC] Document when printk is useable
      [POWERPC] Initialize lockdep earlier

Christian Ehrhardt (1):
      [POWERPC] 4xx: Fix PCI mem in sequoia DTS

Christoph Hellwig (3):
      [POWERPC] spufs: spu_create should send inotify IM_CREATE event
      [POWERPC] spufs: don't requeue victim contex in find_victim if it's not in spu_run
      [POWERPC] spufs: lockdep annotations for spufs_dir_close

Huang Weiyi (1):
      [POWERPC] Remove duplicate #include

Jeremy Kerr (6):
      [POWERPC] cell: Fix lost interrupts due to fasteoi handler
      [POWERPC] spufs: don't touch suspend bits when purging DMA queue
      [POWERPC] spufs: fix save of mfc_cntl register
      [POWERPC] spufs: fix post-stopped update of MFC_CNTL register
      [POWERPC] spufs: update master runcntl with context lock held
      [POWERPC] spufs: don't acquire state_mutex interruptible while performing callback

Jochen Friedrich (1):
      [POWERPC] Fix of_i2c include for module compilation

Luke Browning (4):
      [POWERPC] spufs: set SPU_CONTEXT_SWITCH_PENDING before synchronising SPU irqs
      [POWERPC] spufs: try to route SPU interrupts to local node
      [POWERPC] spufs: fix concurrent delivery of class 0 & 1 exceptions
      [POWERPC] spufs: handle faults while the context switch pending flag is set

Nate Case (1):
      [POWERPC] Remove leftover printk in isa-bridge.c

Stefan Roese (2):
      [POWERPC] 4xx: Fix problem with new TLB storage attibute fields on 440x6 core
      [POWERPC] 4xx: Add endpoint support to 4xx PCIe driver

[git pull] Please pull powerpc.git merge branch

[Paul Mackerras]

Linus,

Please pull from the 'merge' branch of

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

to get 5 commits; one that fixes a compile problem for ARCH=powerpc,
and 4 that fix compile problems for ARCH=ppc.  Since 2.6.26 will be
the last release that includes arch/ppc, we probably should make sure
it works in case anyone wants to refer to it subsequently.

Thanks,
Paul.

 arch/powerpc/kernel/Makefile   |    6 ++++++
 arch/powerpc/kernel/cputable.c |    2 ++
 arch/powerpc/lib/Makefile      |    2 +-
 arch/ppc/Makefile              |    2 +-
 arch/ppc/kernel/ppc_ksyms.c    |    1 +
 arch/ppc/kernel/setup.c        |    1 +
 arch/ppc/platforms/residual.c  |    1 +
 include/asm-ppc/system.h       |    2 +-
 8 files changed, 14 insertions(+), 3 deletions(-)

Paul Mackerras (2):
      [POWERPC] Fix default cputable entries for e200 and e500 families
      [POWERPC] ppc: More compile fixes

Segher Boessenkool (3):
      [POWERPC] ppc: Use ebony_defconfig for defconfig
      [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c
      [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds

[git pull] Please pull powerpc.git merge branch

[Paul Mackerras]

Linus,

Please pull from the 'merge' branch of

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

Most of the bulk is in defconfig and device-tree source (.dts) files,
which are effectively documentation.  The change to mpc85xx_mds.c is
adding some fixups to allow ethernet to work on the 8568 MDS board
even if firmware doesn't initialize it properly.  The rest are all
relatively small, well-contained bug and compile fixes.

Thanks,
Paul.

 arch/powerpc/boot/dts/mpc8377_mds.dts        |   27 ++++++
 arch/powerpc/boot/dts/mpc8610_hpcd.dts       |   60 ++++++++++++-
 arch/powerpc/boot/dts/sbc8548.dts            |   94 ++++++++++++++++++++
 arch/powerpc/configs/mpc8610_hpcd_defconfig  |   95 +++++++++++++++++++-
 arch/powerpc/mm/hash_utils_64.c              |   28 ++++++
 arch/powerpc/mm/init_64.c                    |   10 +-
 arch/powerpc/mm/slb.c                        |   16 +++
 arch/powerpc/mm/slb_low.S                    |   16 +++
 arch/powerpc/platforms/85xx/mpc85xx_mds.c    |  121 ++++++++++++++++++++++++++
 arch/powerpc/platforms/85xx/sbc8548.c        |   30 ++++++
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |   15 +++
 arch/powerpc/platforms/cell/io-workarounds.c |    6 +
 arch/powerpc/platforms/cell/io-workarounds.h |    6 +
 arch/powerpc/platforms/cell/spufs/file.c     |    1 
 arch/powerpc/platforms/cell/spufs/sched.c    |    2 
 drivers/macintosh/adb.c                      |    2 
 drivers/of/base.c                            |    3 +
 include/asm-powerpc/mmu-hash64.h             |    1 
 include/asm-powerpc/pgtable-ppc64.h          |   10 +-
 include/asm-powerpc/uaccess.h                |    4 -
 20 files changed, 508 insertions(+), 39 deletions(-)

Andy Fleming (2):
      [POWERPC] 85xx: Add 8568 PHY workarounds to board code
      [POWERPC] 85xx: Fix some sparse warnings for 85xx MDS

Anton Vorontsov (3):
      [POWERPC] 86xx: mpc8610_hpcd: use ULI526X driver for on-board ethernet
      [POWERPC] 86xx: mpc8610_hpcd: add support for NOR and NAND flashes
      [POWERPC] 86xx: mpc8610_hpcd: fix second serial port

Benjamin Herrenschmidt (1):
      [POWERPC] vmemmap fixes to use smaller pages

FUJITA Tomonori (1):
      [POWERPC] spufs: Fix compile error

Ishizaki Kou (1):
      [POWERPC] cell: Fix section mismatches in io-workarounds code

Jeremy McNicoll (1):
      [POWERPC] 85xx: SBC8548 - Add flash support and HW Rev reporting

Luke Browning (1):
      [POWERPC] spufs: Fix pointer reference in find_victim

Nate Case (1):
      [POWERPC] Fix uninitialized variable bug in copy_{to|from}_user

Robert P. J. Day (1):
      [POWERPC] macintosh: Replace deprecated __initcall with device_initcall

Timur Tabi (1):
      [POWERPC] Add null pointer check to of_find_property

Zhang Wei (1):
      [POWERPC] 83xx: Enable DMA engine on the MPC8377 MDS board.

[git pull] Please pull powerpc.git merge branch

[Paul Mackerras]

Linus,

Please pull from the 'merge' branch of

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

to get a collection of small fixes and a defconfig update for
powerpc, plus an update to MAINTAINERS for the Cell port.

Thanks,
Paul.

 MAINTAINERS                            |   23 ++-
 arch/powerpc/boot/.gitignore           |    8 -
 arch/powerpc/boot/Makefile             |    6 +
 arch/powerpc/boot/dts/mpc8377_mds.dts  |   18 ++
 arch/powerpc/configs/chrp32_defconfig  |  164 +++++++++++++---------
 arch/powerpc/configs/g5_defconfig      |  226 +++++++++++++++----------------
 arch/powerpc/configs/iseries_defconfig |  146 +++++++++++++-------
 arch/powerpc/configs/pmac32_defconfig  |  174 +++++++++++++++---------
 arch/powerpc/configs/ppc64_defconfig   |  236 +++++++++++++++-----------------
 arch/powerpc/configs/pseries_defconfig |  224 +++++++++++++++---------------
 arch/powerpc/mm/hash_low_32.S          |    2 
 lib/lmb.c                              |    3 
 12 files changed, 675 insertions(+), 555 deletions(-)

Adrian Bunk (1):
      [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword

Arnd Bergmann (1):
      [POWERPC] Update Cell MAINTAINERS entry, add spufs entry

Kumar Gala (4):
      lmb: Fix compile warning
      [POWERPC] Remove generated files on make clean
      [POWERPC] Update arch/powerpc/boot/.gitignore
      [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec

Paul Mackerras (1):
      [POWERPC] Update defconfigs for desktop/server systems

[git pull] Please pull powerpc.git merge branch

[Paul Mackerras]

Linus,

Please pull from the 'merge' branch of

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

to get some more small bug and warning fixes for powerpc (and one
commit that just updates some comments).

Thanks,
Paul.

 arch/powerpc/kernel/prom_init_check.sh |    2 +-
 arch/powerpc/mm/pgtable_32.c           |    2 +-
 arch/powerpc/platforms/ps3/mm.c        |    3 +++
 arch/powerpc/sysdev/mpic.c             |   20 +++-----------------
 drivers/block/viodasd.c                |    2 +-
 drivers/cdrom/viocd.c                  |    2 +-
 drivers/char/viocons.c                 |    2 +-
 drivers/char/viotape.c                 |    2 +-
 include/asm-powerpc/mpic.h             |    3 +--
 9 files changed, 13 insertions(+), 25 deletions(-)

David Gibson (1):
      [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS

Geoff Levand (1):
      [POWERPC] PS3: Fix memory hotplug

Michael Ellerman (1):
      [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init

Stephen Rothwell (2):
      [POWERPC] mpic: Fix use of uninitialized variable
      [POWERPC] iSeries: Remove unused mail address

[git pull] Please pull powerpc.git merge branch

[Paul Mackerras]

Linus,

Please pull from the 'merge' branch of

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

to get four more bug-fixes for powerpc (including Ben's patch adding
memory clobbers to the asm for I/O accessors) and a pasemi defconfig
update.

Thanks,
Paul.

 arch/powerpc/boot/dts/mpc8610_hpcd.dts |   10 +-
 arch/powerpc/configs/pasemi_defconfig  |  172 +++++++++++++++++++++-----------
 arch/ppc/kernel/ppc_ksyms.c            |    2 
 drivers/pcmcia/electra_cf.c            |    1 
 include/asm-powerpc/io.h               |   12 +-
 5 files changed, 126 insertions(+), 71 deletions(-)

Benjamin Herrenschmidt (1):
      [POWERPC] Add "memory" clobber to MMIO accessors

Olof Johansson (2):
      electra_cf: Add MODULE_DEVICE_TABLE()
      [POWERPC] pasemi: update pasemi_defconfig, enable electra_cf

Timur Tabi (1):
      [POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree

Tony Breeds (1):
      [POWERPC] Export empty_zero_page and copy_page in arch/ppc

[git pull] Please pull powerpc.git merge branch

[Paul Mackerras]

Please pull from the 'merge' branch of

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

to get 4 more bug-fix commits, plus one from Stephen Rothwell that
changes one place where we do sprintf(pci_name(dev), ... to use
dev_set_name() instead, so that we don't end up with an error when a
change that is in Greg KH's tree (changing pci_name(dev) to be const)
hits your tree.

Thanks,
Paul.

 arch/powerpc/boot/Makefile      |    4 ++--
 arch/powerpc/kernel/pci_64.c    |    2 +-
 arch/powerpc/kernel/signal_64.c |    4 +++-
 arch/powerpc/mm/mem.c           |    3 +--
 drivers/net/Kconfig             |    2 +-
 include/linux/memory_hotplug.h  |   16 ++++++++--------
 6 files changed, 16 insertions(+), 15 deletions(-)

Adrian Bunk (1):
      [POWERPC] boot/Makefile CONFIG_ variable fixes

Benjamin Herrenschmidt (1):
      [POWERPC] Fix incorrect enabling of VMX when building signal or user context

Nathan Lynch (2):
      [POWERPC] Make walk_memory_resource available with MEMORY_HOTPLUG=n
      [POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG

Stephen Rothwell (1):
      [POWERPC] Use dev_set_name in pci_64.c

[git pull] Please pull powerpc.git merge branch

[Paul Mackerras]

Please pull from the 'merge' branch of

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

to get some more bug fixes and defconfig updates for powerpc, as
listed below.  Almost all of the bulk is in the defconfig updates for
the Freescale embedded platforms.

Thanks,
Paul.

 arch/powerpc/Makefile                             |    4 
 arch/powerpc/boot/Makefile                        |    2 
 arch/powerpc/boot/crtsavres.S                     |  233 +++++++++++++++
 arch/powerpc/boot/dts/mpc8377_rdb.dts             |    8 -
 arch/powerpc/boot/dts/mpc8378_rdb.dts             |    8 -
 arch/powerpc/boot/dts/mpc8379_rdb.dts             |    8 -
 arch/powerpc/boot/dts/mpc8548cds.dts              |    4 
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |  155 +++++++---
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |  162 +++++++----
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |  146 ++++++----
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |  150 +++++++---
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |  157 +++++++---
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |  150 ++++++----
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |  146 ++++++----
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |  146 ++++++----
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |  146 ++++++----
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |  224 +++++++++++----
 arch/powerpc/configs/83xx/sbc834x_defconfig       |  140 ++++++---
 arch/powerpc/configs/85xx/ksi8560_defconfig       |  168 +++++++----
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |  133 ++++++---
 arch/powerpc/configs/85xx/mpc8544_ds_defconfig    |  210 +++++++++-----
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |  135 ++++++---
 arch/powerpc/configs/85xx/mpc8568mds_defconfig    |  150 ++++++----
 arch/powerpc/configs/85xx/mpc8572_ds_defconfig    |  210 +++++++++-----
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |  137 ++++++---
 arch/powerpc/configs/85xx/sbc8548_defconfig       |  131 ++++++---
 arch/powerpc/configs/85xx/sbc8560_defconfig       |  135 ++++++---
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |  152 ++++++----
 arch/powerpc/configs/85xx/tqm8540_defconfig       |  147 ++++++----
 arch/powerpc/configs/85xx/tqm8541_defconfig       |  146 ++++++----
 arch/powerpc/configs/85xx/tqm8555_defconfig       |  146 ++++++----
 arch/powerpc/configs/85xx/tqm8560_defconfig       |  146 ++++++----
 arch/powerpc/configs/adder875_defconfig           |   52 ++-
 arch/powerpc/configs/ep8248e_defconfig            |  124 ++++++--
 arch/powerpc/configs/ep88xc_defconfig             |   47 ++-
 arch/powerpc/configs/linkstation_defconfig        |  172 +++++++----
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |  136 ++++++---
 arch/powerpc/configs/mpc8272_ads_defconfig        |  126 ++++++--
 arch/powerpc/configs/mpc83xx_defconfig            |  151 ++++++----
 arch/powerpc/configs/mpc85xx_defconfig            |  230 ++++++++++-----
 arch/powerpc/configs/mpc8610_hpcd_defconfig       |  316 ++++++++++++---------
 arch/powerpc/configs/mpc8641_hpcn_defconfig       |  210 +++++++++-----
 arch/powerpc/configs/mpc866_ads_defconfig         |  128 ++++++---
 arch/powerpc/configs/mpc885_ads_defconfig         |   47 ++-
 arch/powerpc/configs/pq2fads_defconfig            |  133 ++++++---
 arch/powerpc/configs/prpmc2800_defconfig          |  153 +++++++---
 arch/powerpc/configs/sbc8641d_defconfig           |  150 ++++++----
 arch/powerpc/configs/storcenter_defconfig         |   71 +++--
 arch/powerpc/kernel/irq.c                         |    2 
 arch/powerpc/kernel/ppc_ksyms.c                   |    2 
 arch/powerpc/kernel/prom_init_check.sh            |   14 +
 arch/powerpc/lib/Makefile                         |    2 
 arch/powerpc/lib/crtsavres.S                      |  229 +++++++++++++++
 arch/powerpc/platforms/85xx/Kconfig               |    1 
 arch/powerpc/platforms/cell/spu_base.c            |   44 ++-
 arch/powerpc/platforms/cell/spufs/run.c           |   21 +
 arch/powerpc/platforms/cell/spufs/sched.c         |   19 +
 arch/powerpc/platforms/pseries/eeh_driver.c       |   11 -
 arch/powerpc/platforms/pseries/nvram.c            |    4 
 arch/powerpc/xmon/xmon.c                          |    1 
 drivers/macintosh/mediabay.c                      |    4 
 drivers/macintosh/smu.c                           |    5 
 drivers/macintosh/therm_adt746x.c                 |   13 +
 include/asm-powerpc/mediabay.h                    |   12 +
 include/asm-powerpc/spu.h                         |    1 
 include/asm-powerpc/spu_csa.h                     |    2 
 include/asm-powerpc/system.h                      |    2 
 67 files changed, 4557 insertions(+), 2213 deletions(-)
 create mode 100644 arch/powerpc/boot/crtsavres.S
 create mode 100644 arch/powerpc/lib/crtsavres.S

Adrian Bunk (1):
      [POWERPC] Build fix for drivers/macintosh/mediabay.c

Andrew Morton (1):
      [POWERPC] Fix warning in pseries/eeh_driver.c

Anton Vorontsov (1):
      [POWERPC] 83xx: MPC837xRDB's VSC7385 ethernet switch isn't on the MDIO bus

Emil Medve (1):
      [POWERPC] Fix return value check logic in debugfs virq_mapping setup

Grant Likely (1):
      [POWERPC] bootwrapper: add simpleImage* to list of boot targets

Julia Lawall (3):
      [POWERPC] Add missing of_node_put in pseries/nvram.c
      [POWERPC] Add missing of_node_put in drivers/macintosh/smu.c
      [POWERPC] Add missing of_node_put in drivers/macintosh/therm_adt746x.c

Kumar Gala (5):
      [POWERPC] 85xx: MPC85xx MDS - Unconditionally select PHYLIB for board fixups
      [POWERPC] 85xx: MPC8548CDS - Fix size of PCIe IO space
      [POWERPC] Updated Freescale PPC defconfigs
      [POWERPC] Fix bootwrapper builds with newer gcc versions
      [POWERPC] Fix -Os kernel builds with newer gcc versions

Luke Browning (4):
      powerpc/spufs: wait for stable spu status in spu_stopped()
      powerpc/spufs: remove class_0_dsisr from spu exception handling
      powerpc/spufs: synchronize interaction between spu exception handling and time slicing
      powerpc/spufs: fix missed stop-and-signal event

Nick Piggin (1):
      [POWERPC] Fix rmb to order cacheable vs. noncacheable

Stephen Rothwell (1):
      [POWERPC] Remove ppc32's export of console_drivers

Timur Tabi (1):
      [POWERPC] 8610: Update defconfig for MPC8610 HPCD

Re: [git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

On Mon, 2008-06-16 at 15:56 +1000, Paul Mackerras wrote:
> Please pull from the 'merge' branch of
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
> 
> to get some more bug fixes and defconfig updates for powerpc, as
> listed below.  Almost all of the bulk is in the defconfig updates for
> the Freescale embedded platforms.

Paul, did you have a chance to fix our defconfig's for the loss of
SFF support in libata ?

Cheers,
Ben.

Re: [git pull] Please pull powerpc.git merge branch

[Paul Mackerras]