[git pull] Please pull powerpc.git merge branch

[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 three small commits that fix compile errors and a warning on
powerpc.

Thanks,
Paul.

 arch/powerpc/platforms/cell/ras.c          |    1 +
 arch/powerpc/platforms/pseries/pci_dlpar.c |    1 -
 drivers/ps3/ps3-lpm.c                      |    1 +
 3 files changed, 2 insertions(+), 1 deletions(-)

Alexey Dobriyan (2):
      powerpc/ps3: Fix compile error in ps3-lpm.c
      powerpc/cell: Fix compile error in ras.c

Stephen Rothwell (1):
      powerpc: Fix "unused variable" warning in pci_dlpar.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are 3 more small powerpc fixes that should still go into .16.
One is a recent regression (MMCR2 business), the other is a trivial
endian fix without which FW updates won't work on LE in IBM machines,
and the 3rd one turns a BUG_ON into a WARN_ON which is definitely
a LOT more friendly especially when the whole thing is about retrieving
error logs ...

Cheers,
Ben.

The following changes since commit 6f5405bc2ee0102bb3856e2cdea64ff415db2e0c:

  powerpc: use _GLOBAL_TOC for memmove (2014-07-22 15:56:04 +1000)

are available in the git repository at:

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

for you to fetch changes up to 396a34340cdf7373c00e3977db27d1a20ea65ebc:

  powerpc: Fix endianness of flash_block_list in rtas_flash (2014-07-28 11:30:54 +1000)

----------------------------------------------------------------
Michael Ellerman (1):
      powerpc/perf: Fix MMCR2 handling for EBB

Thomas Falcon (1):
      powerpc: Fix endianness of flash_block_list in rtas_flash

Vasant Hegde (1):
      powerpc/powernv: Change BUG_ON to WARN_ON in elog code

 arch/powerpc/kernel/rtas_flash.c           | 6 ++++--
 arch/powerpc/perf/core-book3s.c            | 6 +++---
 arch/powerpc/platforms/powernv/opal-elog.c | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here is a handful of powerpc fixes for 3.16. They are all pretty
simple and self contained and should still make this release.

Cheers,
Ben.

The following changes since commit f56029410a13cae3652d1f34788045c40a13ffc7:

  powerpc/perf: Never program book3s PMCs with values >= 0x80000000 (2014-07-11 13:50:47 +1000)

are available in the git repository at:

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

for you to fetch changes up to 6f5405bc2ee0102bb3856e2cdea64ff415db2e0c:

  powerpc: use _GLOBAL_TOC for memmove (2014-07-22 15:56:04 +1000)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc: subpage_protect: Increase the array size to take care of 64TB

Joel Stanley (1):
      powerpc: Disable doorbells on Power8 DD1.x

Li Zhong (1):
      powerpc: use _GLOBAL_TOC for memmove

Paul Mackerras (1):
      powerpc: Fix bugs in emulate_step()

Tyrel Datwyler (1):
      powerpc/pseries: dynamically added OF nodes need to call of_node_init

 arch/powerpc/include/asm/cputable.h       |  1 +
 arch/powerpc/include/asm/mmu-hash64.h     |  3 ++-
 arch/powerpc/kernel/cputable.c            | 20 ++++++++++++++++++++
 arch/powerpc/lib/mem_64.S                 |  2 +-
 arch/powerpc/lib/sstep.c                  | 10 +++++-----
 arch/powerpc/platforms/pseries/dlpar.c    |  1 +
 arch/powerpc/platforms/pseries/reconfig.c |  1 +
 7 files changed, 31 insertions(+), 7 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc fixes for 3.16

There's a small series of 3 patches that fix saving/restoring MMUCR2
when using KVM without which perf goes completely bonkers in the host
system. Another perf fix from Anton that's been rotting away in patchwork
due to my poor eyesight, a couple of compile fixes, a little addition
to the WSP removal by Michael (removing a bit more dead stuff) and
a fix for an embarassing regression with our soft irq masking.

Cheers,
Ben.

The following changes since commit 6663a4fa6711050036562ddfd2086edf735fae21:

  powerpc: Don't skip ePAPR spin-table CPUs (2014-06-25 13:10:49 +1000)

are available in the git repository at:

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

for you to fetch changes up to f56029410a13cae3652d1f34788045c40a13ffc7:

  powerpc/perf: Never program book3s PMCs with values >= 0x80000000 (2014-07-11 13:50:47 +1000)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc/perf: Never program book3s PMCs with values >= 0x80000000

Guenter Roeck (1):
      powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64

Joel Stanley (3):
      powerpc/kvm: Remove redundant save of SIER AND MMCR2
      powerpc/perf: Add PPMU_ARCH_207S define
      powerpc/perf: Clear MMCR2 when enabling PMU

Michael Ellerman (2):
      powerpc/cell: Fix compilation with CONFIG_COREDUMP=n
      powerpc: Clean up MMU_FTRS_A2 and MMU_FTR_TYPE_3E

Preeti U Murthy (1):
      powerpc/powernv: Check for IRQHAPPENED before sleeping

 arch/powerpc/Kconfig                         |  3 ++-
 arch/powerpc/include/asm/mmu.h               | 10 +---------
 arch/powerpc/include/asm/perf_event_server.h |  3 +--
 arch/powerpc/kernel/idle_power7.S            |  2 +-
 arch/powerpc/kvm/book3s_hv_interrupts.S      |  5 -----
 arch/powerpc/mm/mmu_context_nohash.c         | 12 +-----------
 arch/powerpc/perf/core-book3s.c              | 26 ++++++++++++++++++++++----
 arch/powerpc/perf/power8-pmu.c               |  2 +-
 arch/powerpc/platforms/cell/spu_syscalls.c   |  2 ++
 arch/powerpc/platforms/cell/spufs/Makefile   |  3 ++-
 arch/powerpc/platforms/cell/spufs/syscalls.c |  6 ++++--
 11 files changed, 37 insertions(+), 37 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a handful or two of powerpc fixes and simple/trivial
cleanups. A bunch of them fix ftrace with the new ABI v2 in
Little Endian, the rest is a scattering of fairly simple things.

Cheers,
Ben.

The following changes since commit 68986c9f0f4552c34c248501eb0c690553866d6e:

  Revert "offb: Add palette hack for little endian" (2014-06-16 19:45:45 +1000)

are available in the git repository at:

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

for you to fetch changes up to 6663a4fa6711050036562ddfd2086edf735fae21:

  powerpc: Don't skip ePAPR spin-table CPUs (2014-06-25 13:10:49 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (1):
      powerpc: Remove __arch_swab*

Catalin Marinas (1):
      powerpc/kmemleak: Do not scan the DART table

Gavin Shan (1):
      powerpc/kerenl: Enable EEH for IO accessors

Laurent Dufour (1):
      powerpc/module: Fix TOC symbol CRC

Michael Ellerman (9):
      powerpc: Remove ancient DEBUG_SIG code
      powerpc: Add ppc_global_function_entry()
      powerpc/ftrace: Fix typo in mask of opcode
      powerpc/ftrace: Fix inverted check of create_branch()
      powerpc/ftrace: Fix nop of modules on 64bit LE (ABIv2)
      powerpc/ftrace: Use pr_fmt() to namespace error messages
      powerpc/kprobes: Fix jprobes on ABI v2 (LE)
      selftests/powerpc: Use the test harness for the TM DSCR test
      powerpc/powernv: Remove OPAL v1 takeover

Rasmus Villemoes (1):
      powerpc/macintosh/smu.c: Fix closing brace followed by if

Rickard Strandqvist (1):
      powerpc/cell: cbe_thermal.c: Cleaning up a variable is of the wrong type

Scott Wood (1):
      powerpc: Don't skip ePAPR spin-table CPUs

 arch/powerpc/Kconfig.debug                         |   1 -
 arch/powerpc/include/asm/code-patching.h           |  11 ++
 arch/powerpc/include/asm/opal.h                    |  29 ---
 arch/powerpc/include/asm/swab.h                    |  43 -----
 arch/powerpc/kernel/ftrace.c                       |  52 +++--
 arch/powerpc/kernel/iomap.c                        |  20 +-
 arch/powerpc/kernel/kprobes.c                      |   9 +-
 arch/powerpc/kernel/module_64.c                    |  11 +-
 arch/powerpc/kernel/prom.c                         |   7 -
 arch/powerpc/kernel/prom_init.c                    | 211 ---------------------
 arch/powerpc/kernel/prom_init_check.sh             |   4 +-
 arch/powerpc/kernel/setup-common.c                 |  10 +-
 arch/powerpc/kernel/signal_32.c                    |   9 -
 arch/powerpc/kernel/signal_64.c                    |   9 -
 arch/powerpc/platforms/cell/cbe_thermal.c          |   2 +-
 arch/powerpc/platforms/powernv/Makefile            |   2 +-
 arch/powerpc/platforms/powernv/opal-takeover.S     | 140 --------------
 arch/powerpc/sysdev/dart_iommu.c                   |   5 +
 drivers/macintosh/smu.c                            |   3 +-
 tools/testing/selftests/powerpc/tm/Makefile        |   2 +-
 .../testing/selftests/powerpc/tm/tm-resched-dscr.c |  14 +-
 21 files changed, 93 insertions(+), 501 deletions(-)
 delete mode 100644 arch/powerpc/platforms/powernv/opal-takeover.S

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This is a single revert for a patch I should have never merged in the
first place had I reviewed things with a clear mind at the time :-(

Cheers,
Ben.

The following changes since commit
7171511eaec5bf23fb06078f59784a3a0626b38f:

  Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)

are available in the git repository at:

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

for you to fetch changes up to 68986c9f0f4552c34c248501eb0c690553866d6e:

  Revert "offb: Add palette hack for little endian" (2014-06-16 19:45:45
+1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (1):
      Revert "offb: Add palette hack for little endian"

 drivers/video/fbdev/offb.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's just one trivial patch to wire up sys_renameat2 which I
seem to have completely missed so far. (My test build scripts fwd me
warnings but miss the ones generated for missing syscalls).

Cheers,
Ben.

The following changes since commit 011e4b02f1da156ac7fea28a9da878f3c23af739:

  powerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode (2014-05-28 13:24:26 +1000)

are available in the git repository at:

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

for you to fetch changes up to 8212f58a9b151d842fa60a70f354e43c61fad839:

  powerpc: Wire renameat2() syscall (2014-06-02 09:24:27 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (1):
      powerpc: Wire renameat2() syscall

 arch/powerpc/include/asm/systbl.h      | 1 +
 arch/powerpc/include/asm/unistd.h      | 2 +-
 arch/powerpc/include/uapi/asm/unistd.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a pair of powerpc fixes for 3.15 which are also going to stable.

One's a fix for building with newer binutils (the problem currently only
affects the BookE kernels but the affected macro might come back into
use on BookS platforms at any time). Unfortunately, the binutils maintainer
did a backward incompatible change to a construct that we use so we have
to add Makefile check.

The other one is a fix for CPUs getting stuck in kexec when running single
threaded. Since we routinely use kexec on power (including in our newer
bootloaders), I deemed that important enough.

Cheers,
Ben.

The following changes since commit 8050936caf125fbe54111ba5e696b68a360556ba:

  powerpc: irq work racing with timer interrupt can result in timer interrupt hang (2014-05-12 14:29:28 +1000)

are available in the git repository at:

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

for you to fetch changes up to 011e4b02f1da156ac7fea28a9da878f3c23af739:

  powerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode (2014-05-28 13:24:26 +1000)

----------------------------------------------------------------
Guenter Roeck (1):
      powerpc: Fix 64 bit builds with binutils 2.24

Srivatsa S. Bhat (1):
      powerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode

 arch/powerpc/Makefile                  | 4 +++-
 arch/powerpc/include/asm/ppc_asm.h     | 7 ++++++-
 arch/powerpc/kernel/machine_kexec_64.c | 2 +-
 kernel/kexec.c                         | 8 ++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

[ This is a resent of Wed. email in case you missed it while away ]

Here are a couple of fixes for 3.15. One from Anton fixes a nasty regression
I introduced when trying to fix a loss of irq_work whose consequences is
that we can completely lose timer interrupts on a CPU... not pretty.

The other one is a change to our PCIe reset hook to use a firmware call
instead of direclnet config space accesses to trigger a fundamental reset
on the root port. This is necessary so that the FW gets a chance to
disable the link down error monitoring, which would otherwise trip
and cause subsequent fatal EEH error.

Cheers,
Ben.

The following changes since commit e4565362c7adc31201135c4b6d649fc1bdc3bf20:

  powerpc/4xx: Fix section mismatch in ppc4xx_pci.c (2014-04-28 16:32:53 +1000)

are available in the git repository at:

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

for you to fetch changes up to 8050936caf125fbe54111ba5e696b68a360556ba:

  powerpc: irq work racing with timer interrupt can result in timer interrupt hang (2014-05-12 14:29:28 +1000)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc: irq work racing with timer interrupt can result in timer interrupt hang

Gavin Shan (1):
      powerpc/powernv: Reset root port in firmware

 arch/powerpc/kernel/time.c                | 3 ---
 arch/powerpc/platforms/powernv/eeh-ioda.c | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a couple of fixes for 3.15. One from Anton fixes a nasty regression
I introduced when trying to fix a loss of irq_work whose consequences is
that we can completely lose timer interrupts on a CPU... not pretty.

The other one is a change to our PCIe reset hook to use a firmware call
instead of direct config space accesses to trigger a fundamental reset
on the root port. This is necessary so that the FW gets a chance to
disable the link down error monitoring, which would otherwise trip
and cause subsequent fatal EEH error.

Cheers,
Ben.

The following changes since commit e4565362c7adc31201135c4b6d649fc1bdc3bf20:

  powerpc/4xx: Fix section mismatch in ppc4xx_pci.c (2014-04-28 16:32:53 +1000)

are available in the git repository at:

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

for you to fetch changes up to 8050936caf125fbe54111ba5e696b68a360556ba:

  powerpc: irq work racing with timer interrupt can result in timer interrupt hang (2014-05-12 14:29:28 +1000)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc: irq work racing with timer interrupt can result in timer interrupt hang

Gavin Shan (1):
      powerpc/powernv: Reset root port in firmware

 arch/powerpc/kernel/time.c                | 3 ---
 arch/powerpc/platforms/powernv/eeh-ioda.c | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here is a bunch of post-merge window fixes that have been accumulating
in patchwork while I was on vacation or buried under other stuff last
week.

We have the now usual batch of LE fixes from Anton (sadly some new stuff
that went into this merge window had endian issues, we'll try to make
sure we do better next time)

Some fixes and cleanups to the new 24x7 performance monitoring stuff
(mostly typos and cleaning up printk's)

A series of fixes for an issue with our runlatch bit, which wasn't set
properly for offlined threads/cores and under KVM, causing potentially
some counters to misbehave along with possible power management issues.

A fix for kexec nasty race where the new kernel wouldn't "see" the
secondary processors having reached back into firmware in time.

And finally a few other misc (and pretty simple) bug fixes.

Cheers,
Ben.

The following changes since commit a798c10faf62a505d24e5f6213fbaf904a39623f:

  Linux 3.15-rc2 (2014-04-20 11:08:50 -0700)

are available in the git repository at:

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

for you to fetch changes up to e4565362c7adc31201135c4b6d649fc1bdc3bf20:

  powerpc/4xx: Fix section mismatch in ppc4xx_pci.c (2014-04-28 16:32:53 +1000)

----------------------------------------------------------------
Alistair Popple (1):
      powerpc/4xx: Fix section mismatch in ppc4xx_pci.c

Aneesh Kumar K.V (1):
      powerpc/mm: Fix tlbie to add AVAL fields for 64K pages

Anton Blanchard (11):
      powerpc/powernv: Fix little endian issues in OPAL flash code
      powerpc/powernv: Use uint64_t instead of size_t in OPAL APIs
      powerpc/powernv: Remove some OPAL function declaration duplication
      powerpc/powernv: Fix little endian issues with opal_do_notifier calls
      powerpc/powernv: Fix little endian issues in OPAL error log code
      powerpc/powernv: Create OPAL sglist helper functions and fix endian issues
      powerpc/powernv: Fix little endian issues in OPAL dump code
      powerpc: Rename duplicate COMMAND_LINE_SIZE define
      powerpc: Bump COMMAND_LINE_SIZE to 2048
      powerpc: Bump BOOT_COMMAND_LINE_SIZE to 2048
      powerpc: Fix error return in rtas_flash module init

Benjamin Herrenschmidt (1):
      powerpc/powernv: Fix kexec races going back to OPAL

Cody P Schafer (6):
      powerpc/perf/hv_24x7: Probe errors changed to pr_debug(), padding fixed
      powerpc/perf/hv_gpci: Probe failures use pr_debug(), and padding reduced
      powerpc/perf/hv-gpci: Make device attr static
      powerpc/perf/hv-24x7: Use (unsigned long) not (u32) values when calling plpar_hcall_norets()
      powerpc/perf/hv-24x7: Remove [static 4096], sparse chokes on it
      powerpc/perf/hv-24x7: Catalog version number is be64, not be32

Jeff Mahoney (1):
      powerpc: Export flush_icache_range

Joel Stanley (5):
      powerpc/powernv: Fix sysparam sysfs error handling
      powerpc/powernv: Use ssize_t for sysparam return values
      powerpc/powernv: Check sysfs size before copying
      powerpc/powernv: Fix typos in sysparam code
      powerpc/powernv: Check sysparam size before creation

Li Zhong (2):
      powerpc: Fix Oops in rtas_stop_self()
      powerpc/pseries: Protect remove_memory() with device hotplug lock

Preeti U Murthy (3):
      ppc/powernv: Set the runlatch bits correctly for offline cpus
      ppc/kvm: Set the runlatch bit of a CPU just before starting guest
      ppc/kvm: Clear the runlatch bit of a vcpu before napping

Wei Yang (2):
      powerpc/powernv: Reduce multi-hit of iommu_add_device()
      powerpc/powernv: Release the refcount for pci_dev

 arch/powerpc/boot/main.c                        |   8 +-
 arch/powerpc/boot/ops.h                         |   2 +-
 arch/powerpc/boot/ps3.c                         |   4 +-
 arch/powerpc/include/asm/opal.h                 |  42 ++++-----
 arch/powerpc/include/uapi/asm/setup.h           |   7 +-
 arch/powerpc/kernel/ppc_ksyms.c                 |   1 +
 arch/powerpc/kernel/rtas_flash.c                |   2 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S         |  18 +++-
 arch/powerpc/mm/hash_native_64.c                |  38 ++++----
 arch/powerpc/perf/hv-24x7.c                     |  35 ++++---
 arch/powerpc/perf/hv-gpci.c                     |   6 +-
 arch/powerpc/platforms/powernv/opal-dump.c      |  94 +++----------------
 arch/powerpc/platforms/powernv/opal-elog.c      |  11 ++-
 arch/powerpc/platforms/powernv/opal-flash.c     | 118 ++----------------------
 arch/powerpc/platforms/powernv/opal-sysparam.c  |  32 +++++--
 arch/powerpc/platforms/powernv/opal.c           |  69 +++++++++++++-
 arch/powerpc/platforms/powernv/pci-ioda.c       |   3 +-
 arch/powerpc/platforms/powernv/setup.c          |  48 +++++++++-
 arch/powerpc/platforms/powernv/smp.c            |   3 +
 arch/powerpc/platforms/pseries/hotplug-cpu.c    |   5 +-
 arch/powerpc/platforms/pseries/hotplug-memory.c |  10 +-
 arch/powerpc/sysdev/ppc4xx_pci.c                |   2 +-
 22 files changed, 273 insertions(+), 285 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc things for you.

So you'll find here the conversion of the two new firmware sysfs
interfaces to the new API for self-removing files that Greg and Tejun
introduced, so they can finally remove the old one.

I'm also reverting the hwmon driver for powernv. I shouldn't have merged
it, I got a bit carried away here. I hadn't realized it was never CCed
to the relevant maintainer(s) and list(s), and happens to have some
issues so I'm taking it out and it will come back via the proper
channels.

The rest is a bunch of LE fixes (argh, some of the new stuff was broken 
on LE, I really need to start testing LE myself !) and various random
fixes here and there.

Finally one bit that's not strictly a fix, which is the HVC OPAL change
to "kick" the HVC thread when the firmware tells us there is new
incoming data. I don't feel like waiting for this one, it's simple
enough, and it makes a big difference in console responsiveness which is
good for my nerves.

Cheers,
Ben.

The following changes since commit 18a1a7a1d862ae0794a0179473d08a414dd49234:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (2014-04-06 08:11:57 -0700)

are available in the git repository at:


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

for you to fetch changes up to cc4f265ad9a37bdb1846c45eebe454c382f31d67:

  powerpc/powernv Adapt opal-elog and opal-dump to new sysfs_remove_file_self (2014-04-09 13:51:50 +1000)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc/mm: NUMA pte should be handled via slow path in get_user_pages_fast()

Anton Blanchard (3):
      powerpc/powernv: Fix endian issues with OPAL async code
      powerpc/powernv: Fix endian issues with sensor code
      powerpc: Add lq/stq emulation

Benjamin Herrenschmidt (8):
      powerpc: Adjust CPU_FTR_SMT on all platforms
      powerpc: Make boot_cpuid common between 32 and 64-bit
      powerpc/prom: early_init_dt_scan_cpus() updates cpu features only once
      powerpc/ppc64: Gracefully handle early interrupts
      powerpc/ppc64: Do not turn AIL (reloc-on interrupts) too early
      powerpc/powernv: Add opal_notifier_unregister() and export to modules
      tty/hvc_opal: Kick the HVC thread on OPAL console events
      Revert "powerpc/powernv: hwmon driver for power values, fan rpm and temperature"

Greg Kurz (1):
      powerpc/le: Enable RTAS events support

Joe Perches (1):
      powerpc: Convert last uses of __FUNCTION__ to __func__

Joel Stanley (2):
      powerpc/powernv: Add OPAL message log interface
      powerpc/powernv: Add invalid OPAL call

Li Zhong (1):
      powerpc: Use of_node_init() for the fakenode in msi_bitmap.c

Mahesh Salgaonkar (1):
      powerpc/book3s: Fix mc_recoverable_range buffer overrun issue.

Michael Neuling (3):
      powerpc/tm: Disable IRQ in tm_recheckpoint
      powerpc: Remove dead code in sycall entry
      powerpc/opal: Add missing include

Michael Wang (1):
      power, sched: stop updating inside arch_update_cpu_topology() when nothing to be update

Monam Agarwal (1):
      arch/powerpc: Use RCU_INIT_POINTER(x, NULL) in platforms/cell/spu_syscalls.c

Stephen Chivers (1):
      powerpc: Correct emulated mtfsf instruction

Stewart Smith (1):
      powerpc/powernv Adapt opal-elog and opal-dump to new sysfs_remove_file_self

Tony Breeds (1):
      powerpc/le: Avoid creatng R_PPC64_TOCSAVE relocations for modules.

 arch/powerpc/Makefile                          |   1 +
 arch/powerpc/include/asm/emulated_ops.h        |   1 +
 arch/powerpc/include/asm/opal.h                |  19 +-
 arch/powerpc/include/asm/rtas.h                | 127 ++++--
 arch/powerpc/kernel/align.c                    |  52 ++-
 arch/powerpc/kernel/cpu_setup_power.S          |   2 -
 arch/powerpc/kernel/exceptions-64s.S           |   8 -
 arch/powerpc/kernel/paca.c                     |   3 +-
 arch/powerpc/kernel/process.c                  |  34 +-
 arch/powerpc/kernel/prom.c                     |  58 +--
 arch/powerpc/kernel/rtas.c                     |  15 +-
 arch/powerpc/kernel/rtasd.c                    |  24 +-
 arch/powerpc/kernel/setup-common.c             |   3 +
 arch/powerpc/kernel/setup_32.c                 |   2 -
 arch/powerpc/kernel/setup_64.c                 |  28 +-
 arch/powerpc/kernel/signal_32.c                |   2 +
 arch/powerpc/kernel/signal_64.c                |   2 +
 arch/powerpc/kernel/tm.S                       |   2 +-
 arch/powerpc/kernel/traps.c                    |   1 +
 arch/powerpc/math-emu/mtfsf.c                  |  58 ++-
 arch/powerpc/mm/gup.c                          |  13 +
 arch/powerpc/mm/numa.c                         |  15 +
 arch/powerpc/platforms/cell/spu_syscalls.c     |   2 +-
 arch/powerpc/platforms/powernv/Makefile        |   1 +
 arch/powerpc/platforms/powernv/opal-async.c    |   7 +-
 arch/powerpc/platforms/powernv/opal-dump.c     |   9 +-
 arch/powerpc/platforms/powernv/opal-elog.c     |   9 +-
 arch/powerpc/platforms/powernv/opal-msglog.c   | 120 ++++++
 arch/powerpc/platforms/powernv/opal-sensor.c   |   6 +-
 arch/powerpc/platforms/powernv/opal-sysparam.c |   4 +-
 arch/powerpc/platforms/powernv/opal-wrappers.S |   1 +
 arch/powerpc/platforms/powernv/opal.c          |  59 ++-
 arch/powerpc/platforms/pseries/io_event_irq.c  |   6 +-
 arch/powerpc/platforms/pseries/nvram.c         |  11 +-
 arch/powerpc/platforms/pseries/ras.c           |  17 +-
 arch/powerpc/sysdev/msi_bitmap.c               |   2 +-
 drivers/hwmon/Kconfig                          |   8 -
 drivers/hwmon/Makefile                         |   1 -
 drivers/hwmon/ibmpowernv.c                     | 529 -------------------------
 drivers/tty/hvc/hvc_opal.c                     |  22 +-
 40 files changed, 546 insertions(+), 738 deletions(-)
 create mode 100644 arch/powerpc/platforms/powernv/opal-msglog.c
 delete mode 100644 drivers/hwmon/ibmpowernv.c

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

[Benjamin Herrenschmidt]

On Wed, 2014-04-02 at 10:34 +1100, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> This time around, the powerpc merges are going to be a little bit
> more complicated than usual.

Looks like I sent this one twice, one with "merge" and one with "next"
in the subject. They are otherwise identical (it's "next" really). I
though I had cancelled the sending of the first one with the bad subject
but it looks like my mailer was faster than me.

Cheers,
Ben.

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This time around, the powerpc merges are going to be a little bit
more complicated than usual.

This is the main pull request with most of the work for this merge
window. I will describe it a bit more further down.

There is some additional cpuidle driver work, however I haven't included
it in this tree as it depends on some work in tip/timer-core which
Thomas accidentally forgot to put in a topic branch. Since I didn't want
to carry all of that tip timer stuff in powerpc -next, I setup a
separate branch on top of Thomas tree with just that cpuidle driver in
it, and Stephen has been carrying that in next separately for a while
now. I'll send a separate pull request for it.

Additionally, two new pieces in this tree add users for a sysfs API
that Tejun and Greg have been deprecating in drivers-core-next.
Thankfully Greg reverted the patch that removes the old API so this
merge can happen cleanly, but once merged, I will send a patch adjusting
our new code to the new API so that Greg can send you the removal patch.

Now as for the content of this branch, we have a lot of perf work for
power8 new counters including support for our new "nest" counters
(also called 24x7) under pHyp (not natively yet).

We have new functionality when running under the OPAL firmware
(non-virtualized or KVM host), such as access to the firmware error logs
and service processor dumps, system parameters and sensors, along with
a hwmon driver for the latter.

There's also a bunch of bug fixes accross the board, some LE fixes,
and a nice set of selftests for validating our various types of
copy loops.

On the Freescale side, we see mostly new chip/board revisions, some
clock updates, better support for machine checks and debug exceptions,
etc...

Cheers,
Ben.

The following changes since commit a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67:

  powerpc: Align p_dyn, p_rela and p_st symbols (2014-03-07 13:50:19 +1100)

are available in the git repository at:

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

for you to fetch changes up to cd427485357c0c4b99f69719251baacf25946e11:

  Merge remote-tracking branch 'scott/next' into next (2014-03-24 10:26:10 +1100)

----------------------------------------------------------------

Aneesh Kumar K.V (2):
      powerpc/mm: Make sure a local_irq_disable prevent a parallel THP split
      powerpc/defconfigs: Enable THP in pseries defconfig

Anshuman Khandual (2):
      powerpc/perf: Make some new raw event codes available in sysfs
      powerpc/perf: Define perf_event_print_debug() to print PMU register values

Anton Blanchard (2):
      powerpc: Use default set of netfilter modules (CONFIG_NETFILTER_ADVANCED=n)
      powerpc/compat: 32-bit little endian machine name is ppcle, not ppc

Benjamin Herrenschmidt (2):
      powerpc/pseries: Don't try to register pseries cpu hotplug on non-pseries
      Merge remote-tracking branch 'scott/next' into next

Benjamin Krill (1):
      powerpc/book3e: Fix check for linear mapping in TLB miss handler

Brandon Stewart (1):
      macintosh/adb: Fixed some coding style problems

Cody P Schafer (10):
      sysfs: create bin_attributes under the requested group
      powerpc: Add hvcalls for 24x7 and gpci (Get Performance Counter Info)
      powerpc/perf: Add hv_gpci interface header
      powerpc/perf: Add 24x7 interface headers
      powerpc/perf: Add a shared interface to get gpci version and capabilities
      powerpc/perf: Add macros for defining event fields & formats
      powerpc/perf: Add support for the hv gpci (get performance counter info) interface
      powerpc/perf: Add support for the hv 24x7 interface
      powerpc/perf: Add kconfig option for hypervisor provided counters
      powerpc/perf/hv_{gpci, 24x7}: Add documentation of device attributes

Greg Kurz (1):
      powerpc/le: Big endian arguments for ppc_rtas()

Haren Myneni (2):
      powerpc/pseries: Device tree should only be updated once after suspend/migrate
      powerpc/pseries: Update dynamic cache nodes for suspend/resume operation

Josh Boyer (1):
      powerpc: Update ppc4xx maintainer

Li Zhong (1):
      powerpc: Revert c6102609 and replace it with the correct fix for vio dma mask setting

Luis Henriques (1):
      powerpc/kconfig: Remove TSI108_BRIDGE duplicates

Mahesh Salgaonkar (2):
      powerpc/book3s: Recover from MC in sapphire on SCOM read via MMIO.
      powerpc/book3s: Fix CFAR clobbering issue in machine check handler.

Michael Ellerman (9):
      selftests/powerpc: Import Anton's memcpy / copy_tofrom_user tests
      powerpc: Add a cpu feature CPU_FTR_PMAO_BUG
      powerpc/perf: Add lost exception workaround
      powerpc/perf: Reject EBB events which specify a sample_type
      powerpc/perf: Clean up the EBB hash defines a little
      powerpc/perf: Avoid mutating event in power8_get_constraint()
      powerpc/perf: Add BHRB constraint and IFM MMCRA handling for EBB
      powerpc/perf: Enable BHRB access for EBB events
      powerpc/perf: Fix handling of L3 events with bank == 1

Michael Neuling (1):
      powerpc: Rate-limit users spamming kernel log buffer

Minghuan Lian (1):
      powerpc/pci: Fix IMMRBAR address

Nathan Fontenot (1):
      powerpc/pseries: Use remove_memory() to remove memory

Neelesh Gupta (3):
      powerpc/powernv: Infrastructure to support OPAL async completion
      powerpc/powernv: Enable reading and updating of system parameters
      powerpc/powernv: Enable fetching of platform sensor data

Paul Gortmaker (1):
      powerpc: Delete old PrPMC 280/2800 support

Philippe Bergheaud (1):
      powerpc: Fix xmon disassembler for little-endian

Prabhakar Kushwaha (1):
      powerpc/config: Remove unnecssary CONFIG_FSL_IFC

Scott Wood (8):
      powerpc/booke64: Fix exception numbers
      powerpc/e6500: Make TLB lock recursive
      powerpc/booke64: Use SPRG7 for VDSO
      powerpc/booke64: Use SPRG_TLB_EXFRAME on bolted handlers
      powerpc/booke64: Remove ints from EXCEPTION_COMMON
      powerpc/booke64: Add crit/mc/debug support to EXCEPTION_COMMON
      powerpc/booke64: Critical and machine check exception support
      Revert "powerpc/watchdog: Don't enable interrupt on PPC64 BookE"

Sebastian Siewior (2):
      powerpc: Add "force config cmd line" Kconfig option
      powerpc: 85xx rdb: move np pointer to avoid builderror

Shivaprasad G Bhat (1):
      powerpc/powernv: hwmon driver for power values, fan rpm and temperature

Shuah Khan (1):
      macintosh/adb: Change platform power management to use dev_pm_ops

Stewart Smith (2):
      powerpc/powernv: Read OPAL error log and export it through sysfs
      powerpc/powernv Platform dump interface

Tang Yuantian (2):
      powerpc/mpc85xx: Update clock nodes in device tree
      powerpc: T4240: Add ina220 node in dts

Tiejun Chen (2):
      powerpc/book3e: initialize crit/mc/dbg kernel stack pointers
      powerpc/book3e: store crit/mc/dbg exception thread info

Tyrel Datwyler (1):
      powerpc/pseries: Expose in kernel device tree update to drmgr

Wang Dongsheng (2):
      powerpc/fsl: add PVR definition for E500MC and E5500
      fsl/pci: The new pci suspend/resume implementation

Zhao Qiang (2):
      QE: split function mpc85xx_qe_init() into two functions.
      Corenet: Add QE platform support for Corenet

harninder rai (1):
      powerpc/fsl: Add/update miscellaneous missing binding

송은봉 (1):
      powerpc: : Kill CONFIG_MTD_PARTITIONS

 Documentation/ABI/stable/sysfs-firmware-opal-dump  |  41 ++
 Documentation/ABI/stable/sysfs-firmware-opal-elog  |  60 +++
 .../testing/sysfs-bus-event_source-devices-events  | 517 ++++++++++++++++++++
 .../testing/sysfs-bus-event_source-devices-hv_24x7 |  23 +
 .../testing/sysfs-bus-event_source-devices-hv_gpci |  43 ++
 .../devicetree/bindings/powerpc/fsl/l2cache.txt    |  23 +
 .../devicetree/bindings/powerpc/fsl/mem-ctrlr.txt  |  27 ++
 Documentation/devicetree/bindings/usb/fsl-usb.txt  |   4 +-
 MAINTAINERS                                        |   3 +-
 arch/powerpc/Kconfig                               |   9 +
 arch/powerpc/boot/Makefile                         |   5 +-
 arch/powerpc/boot/dts/fsl/b4420si-post.dtsi        |  36 ++
 arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi         |   2 +
 arch/powerpc/boot/dts/fsl/b4860si-post.dtsi        |  36 ++
 arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi         |   4 +
 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi        |  60 +++
 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi         |   4 +
 arch/powerpc/boot/dts/fsl/p3041si-post.dtsi        |  61 +++
 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi         |   4 +
 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi        | 113 +++++
 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi         |   8 +
 arch/powerpc/boot/dts/fsl/p5020si-post.dtsi        |  43 ++
 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi         |   2 +
 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi        |  61 +++
 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi         |   4 +
 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi        |  86 ++++
 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi         |  12 +
 arch/powerpc/boot/dts/t4240qds.dts                 |  42 ++
 arch/powerpc/configs/40x/acadia_defconfig          |   1 -
 arch/powerpc/configs/40x/ep405_defconfig           |   1 -
 arch/powerpc/configs/40x/kilauea_defconfig         |   1 -
 arch/powerpc/configs/40x/makalu_defconfig          |   1 -
 arch/powerpc/configs/40x/walnut_defconfig          |   1 -
 arch/powerpc/configs/44x/arches_defconfig          |   1 -
 arch/powerpc/configs/44x/bluestone_defconfig       |   1 -
 arch/powerpc/configs/44x/canyonlands_defconfig     |   1 -
 arch/powerpc/configs/44x/ebony_defconfig           |   1 -
 arch/powerpc/configs/44x/eiger_defconfig           |   1 -
 arch/powerpc/configs/44x/icon_defconfig            |   1 -
 arch/powerpc/configs/44x/iss476-smp_defconfig      |   1 -
 arch/powerpc/configs/44x/katmai_defconfig          |   1 -
 arch/powerpc/configs/44x/rainier_defconfig         |   1 -
 arch/powerpc/configs/44x/redwood_defconfig         |   1 -
 arch/powerpc/configs/44x/sequoia_defconfig         |   1 -
 arch/powerpc/configs/44x/taishan_defconfig         |   1 -
 arch/powerpc/configs/44x/warp_defconfig            |   1 -
 arch/powerpc/configs/52xx/cm5200_defconfig         |   1 -
 arch/powerpc/configs/52xx/motionpro_defconfig      |   1 -
 arch/powerpc/configs/52xx/pcm030_defconfig         |   1 -
 arch/powerpc/configs/52xx/tqm5200_defconfig        |   1 -
 arch/powerpc/configs/83xx/asp8347_defconfig        |   1 -
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig    |   1 -
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig    |   1 -
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig    |   1 -
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig    |   1 -
 arch/powerpc/configs/83xx/sbc834x_defconfig        |   1 -
 arch/powerpc/configs/85xx/ksi8560_defconfig        |   1 -
 arch/powerpc/configs/85xx/ppa8548_defconfig        |   1 -
 arch/powerpc/configs/85xx/socrates_defconfig       |   1 -
 arch/powerpc/configs/85xx/tqm8540_defconfig        |   1 -
 arch/powerpc/configs/85xx/tqm8541_defconfig        |   1 -
 arch/powerpc/configs/85xx/tqm8548_defconfig        |   1 -
 arch/powerpc/configs/85xx/tqm8555_defconfig        |   1 -
 arch/powerpc/configs/85xx/tqm8560_defconfig        |   1 -
 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig    |   1 -
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig      |   1 -
 arch/powerpc/configs/86xx/gef_sbc310_defconfig     |   1 -
 arch/powerpc/configs/86xx/gef_sbc610_defconfig     |   1 -
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig   |   1 -
 arch/powerpc/configs/86xx/sbc8641d_defconfig       |   1 -
 arch/powerpc/configs/c2k_defconfig                 |   1 -
 arch/powerpc/configs/corenet64_smp_defconfig       |   2 -
 arch/powerpc/configs/linkstation_defconfig         |   1 -
 arch/powerpc/configs/mpc85xx_defconfig             |   2 -
 arch/powerpc/configs/mpc85xx_smp_defconfig         |   2 -
 arch/powerpc/configs/ppc40x_defconfig              |   1 -
 arch/powerpc/configs/ppc44x_defconfig              |   1 -
 arch/powerpc/configs/ppc64_defconfig               |  70 +--
 arch/powerpc/configs/ppc64e_defconfig              |  70 +--
 arch/powerpc/configs/prpmc2800_defconfig           | 108 -----
 arch/powerpc/configs/pseries_defconfig             |  55 +--
 arch/powerpc/configs/pseries_le_defconfig          |  53 +--
 arch/powerpc/configs/storcenter_defconfig          |   1 -
 arch/powerpc/configs/tqm8xx_defconfig              |   1 -
 arch/powerpc/include/asm/compat.h                  |   4 +
 arch/powerpc/include/asm/cputable.h                |   6 +-
 arch/powerpc/include/asm/exception-64e.h           |  15 +-
 arch/powerpc/include/asm/exception-64s.h           |   8 +
 arch/powerpc/include/asm/hvcall.h                  |   5 +
 arch/powerpc/include/asm/kvm_booke_hv_asm.h        |  17 +-
 arch/powerpc/include/asm/machdep.h                 |   7 +
 arch/powerpc/include/asm/mce.h                     |   3 +-
 arch/powerpc/include/asm/mmu-book3e.h              |   9 +-
 arch/powerpc/include/asm/opal.h                    |  60 ++-
 arch/powerpc/include/asm/paca.h                    |   9 +-
 arch/powerpc/include/asm/perf_event_server.h       |   1 +
 arch/powerpc/include/asm/reg.h                     |  18 +-
 arch/powerpc/include/asm/rtas.h                    |   1 +
 arch/powerpc/kernel/asm-offsets.c                  |   2 +-
 arch/powerpc/kernel/cacheinfo.c                    |   7 +-
 arch/powerpc/kernel/cputable.c                     |   2 +-
 arch/powerpc/kernel/exceptions-64e.S               | 435 +++++++++++++----
 arch/powerpc/kernel/exceptions-64s.S               |   5 +
 arch/powerpc/kernel/mce.c                          |   4 +-
 arch/powerpc/kernel/mce_power.c                    |  37 +-
 arch/powerpc/kernel/prom.c                         |   5 +
 arch/powerpc/kernel/rtas.c                         |  22 +-
 arch/powerpc/kernel/setup_64.c                     |  20 +-
 arch/powerpc/kernel/traps.c                        |   5 +-
 arch/powerpc/kernel/vdso.c                         |   8 +-
 arch/powerpc/kernel/vdso32/getcpu.S                |   2 +-
 arch/powerpc/kernel/vdso64/getcpu.S                |   2 +-
 arch/powerpc/kernel/vio.c                          |   3 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S            |   4 +-
 arch/powerpc/kvm/book3s_interrupts.S               |   4 +-
 arch/powerpc/kvm/bookehv_interrupts.S              |  21 +-
 arch/powerpc/lib/memcpy_64.S                       |   2 +
 arch/powerpc/mm/mem.c                              |   7 +-
 arch/powerpc/mm/pgtable_64.c                       |   5 +
 arch/powerpc/mm/tlb_low_64e.S                      |  66 ++-
 arch/powerpc/mm/tlb_nohash.c                       |  11 +
 arch/powerpc/perf/Makefile                         |   2 +
 arch/powerpc/perf/core-book3s.c                    | 172 ++++++-
 arch/powerpc/perf/hv-24x7-catalog.h                |  33 ++
 arch/powerpc/perf/hv-24x7.c                        | 510 ++++++++++++++++++++
 arch/powerpc/perf/hv-24x7.h                        | 109 +++++
 arch/powerpc/perf/hv-common.c                      |  39 ++
 arch/powerpc/perf/hv-common.h                      |  36 ++
 arch/powerpc/perf/hv-gpci.c                        | 294 ++++++++++++
 arch/powerpc/perf/hv-gpci.h                        |  73 +++
 arch/powerpc/perf/power7-events-list.h             |  10 +
 arch/powerpc/perf/power8-pmu.c                     |  78 ++-
 arch/powerpc/platforms/85xx/c293pcie.c             |   1 +
 arch/powerpc/platforms/85xx/common.c               |   6 +
 arch/powerpc/platforms/85xx/corenet_generic.c      |  17 +
 arch/powerpc/platforms/85xx/ge_imp3a.c             |   1 +
 arch/powerpc/platforms/85xx/mpc8536_ds.c           |   1 +
 arch/powerpc/platforms/85xx/mpc85xx.h              |   2 +
 arch/powerpc/platforms/85xx/mpc85xx_cds.c          |   1 +
 arch/powerpc/platforms/85xx/mpc85xx_ds.c           |   3 +
 arch/powerpc/platforms/85xx/mpc85xx_mds.c          |   4 +
 arch/powerpc/platforms/85xx/mpc85xx_rdb.c          |  16 +-
 arch/powerpc/platforms/85xx/p1010rdb.c             |   1 +
 arch/powerpc/platforms/85xx/p1022_ds.c             |   1 +
 arch/powerpc/platforms/85xx/p1022_rdk.c            |   1 +
 arch/powerpc/platforms/85xx/p1023_rds.c            |   2 +
 arch/powerpc/platforms/85xx/qemu_e500.c            |   1 +
 arch/powerpc/platforms/85xx/sbc8548.c              |   1 +
 arch/powerpc/platforms/85xx/twr_p102x.c            |   1 +
 arch/powerpc/platforms/85xx/xes_mpc85xx.c          |   3 +
 arch/powerpc/platforms/embedded6xx/Kconfig         |  10 -
 arch/powerpc/platforms/embedded6xx/Makefile        |   1 -
 arch/powerpc/platforms/embedded6xx/prpmc2800.c     | 156 ------
 arch/powerpc/platforms/powernv/Makefile            |   4 +-
 arch/powerpc/platforms/powernv/opal-async.c        | 203 ++++++++
 arch/powerpc/platforms/powernv/opal-dump.c         | 525 ++++++++++++++++++++
 arch/powerpc/platforms/powernv/opal-elog.c         | 313 ++++++++++++
 arch/powerpc/platforms/powernv/opal-sensor.c       |  64 +++
 arch/powerpc/platforms/powernv/opal-sysparam.c     | 290 +++++++++++
 arch/powerpc/platforms/powernv/opal-wrappers.S     |  14 +
 arch/powerpc/platforms/powernv/opal.c              | 106 ++++-
 arch/powerpc/platforms/powernv/setup.c             |   1 +
 arch/powerpc/platforms/pseries/Kconfig             |  12 +
 arch/powerpc/platforms/pseries/hotplug-cpu.c       |   2 +-
 arch/powerpc/platforms/pseries/hotplug-memory.c    |  83 ++--
 arch/powerpc/platforms/pseries/mobility.c          |  26 +-
 arch/powerpc/platforms/pseries/suspend.c           |  44 +-
 arch/powerpc/sysdev/fsl_pci.c                      | 178 ++++++-
 arch/powerpc/sysdev/fsl_pci.h                      |   8 +
 arch/powerpc/xmon/xmon.c                           |   4 +
 drivers/hwmon/Kconfig                              |   8 +
 drivers/hwmon/Makefile                             |   1 +
 drivers/hwmon/ibmpowernv.c                         | 529 +++++++++++++++++++++
 drivers/macintosh/adb.c                            |  57 ++-
 drivers/watchdog/booke_wdt.c                       |   8 -
 fs/sysfs/group.c                                   |   7 +-
 tools/testing/selftests/powerpc/Makefile           |   2 +-
 tools/testing/selftests/powerpc/copyloops/Makefile |  29 ++
 .../selftests/powerpc/copyloops/asm/ppc_asm.h      |  86 ++++
 .../selftests/powerpc/copyloops/asm/processor.h    |   0
 .../selftests/powerpc/copyloops/copyuser_64.S      |   1 +
 .../selftests/powerpc/copyloops/copyuser_power7.S  |   1 +
 .../selftests/powerpc/copyloops/memcpy_64.S        |   1 +
 .../selftests/powerpc/copyloops/memcpy_power7.S    |   1 +
 .../testing/selftests/powerpc/copyloops/validate.c |  99 ++++
 tools/testing/selftests/powerpc/utils.h            |   3 +
 186 files changed, 5955 insertions(+), 926 deletions(-)
 create mode 100644 Documentation/ABI/stable/sysfs-firmware-opal-dump
 create mode 100644 Documentation/ABI/stable/sysfs-firmware-opal-elog
 create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7
 create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_gpci
 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt
 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/mem-ctrlr.txt
 delete mode 100644 arch/powerpc/configs/prpmc2800_defconfig
 create mode 100644 arch/powerpc/perf/hv-24x7-catalog.h
 create mode 100644 arch/powerpc/perf/hv-24x7.c
 create mode 100644 arch/powerpc/perf/hv-24x7.h
 create mode 100644 arch/powerpc/perf/hv-common.c
 create mode 100644 arch/powerpc/perf/hv-common.h
 create mode 100644 arch/powerpc/perf/hv-gpci.c
 create mode 100644 arch/powerpc/perf/hv-gpci.h
 delete mode 100644 arch/powerpc/platforms/embedded6xx/prpmc2800.c
 create mode 100644 arch/powerpc/platforms/powernv/opal-async.c
 create mode 100644 arch/powerpc/platforms/powernv/opal-dump.c
 create mode 100644 arch/powerpc/platforms/powernv/opal-elog.c
 create mode 100644 arch/powerpc/platforms/powernv/opal-sensor.c
 create mode 100644 arch/powerpc/platforms/powernv/opal-sysparam.c
 create mode 100644 drivers/hwmon/ibmpowernv.c
 create mode 100644 tools/testing/selftests/powerpc/copyloops/Makefile
 create mode 100644 tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h
 create mode 100644 tools/testing/selftests/powerpc/copyloops/asm/processor.h
 create mode 120000 tools/testing/selftests/powerpc/copyloops/copyuser_64.S
 create mode 120000 tools/testing/selftests/powerpc/copyloops/copyuser_power7.S
 create mode 120000 tools/testing/selftests/powerpc/copyloops/memcpy_64.S
 create mode 120000 tools/testing/selftests/powerpc/copyloops/memcpy_power7.S
 create mode 100644 tools/testing/selftests/powerpc/copyloops/validate.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a couple of powerpc fixes for 3.14. One is (another !) nasty TM
problem, we can crash the kernel by forking inside a transaction. The
other one is a simple fix for an alignment issue which can hurt in LE
mode.

Cheers,
Ben.

The following changes since commit e0cf957614976896111e676e5134ac98ee227d3d:

  powerpc/powernv: Fix indirect XSCOM unmangling (2014-02-28 19:15:49 +1100)

are available in the git repository at:

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

for you to fetch changes up to a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67:

  powerpc: Align p_dyn, p_rela and p_st symbols (2014-03-07 13:50:19 +1100)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc: Align p_dyn, p_rela and p_st symbols

Michael Neuling (1):
      powerpc/tm: Fix crash when forking inside a transaction

 arch/powerpc/kernel/process.c  | 9 +++++++++
 arch/powerpc/kernel/reloc_64.S | 1 +
 2 files changed, 10 insertions(+)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc fixes for 3.14. Most of these are also
CC'ed to stable and fix bugs in new functionality introduced in
the last 2 or 3 versions.

The following changes since commit 66f9af83e56bfa12964d251df9d60fb571579913:

  powerpc/eeh: Disable EEH on reboot (2014-02-17 11:19:39 +1100)

are available in the git repository at:

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

for you to fetch changes up to e0cf957614976896111e676e5134ac98ee227d3d:

  powerpc/powernv: Fix indirect XSCOM unmangling (2014-02-28 19:15:49 +1100)

----------------------------------------------------------------
Benjamin Herrenschmidt (2):
      powerpc/powernv: Fix opal_xscom_{read,write} prototype
      powerpc/powernv: Fix indirect XSCOM unmangling

Gavin Shan (2):
      powerpc/powernv: Dump PHB diag-data immediately
      powerpc/powernv: Refactor PHB diag-data dump

Laurent Dufour (1):
      powerpc/crashdump : Fix page frame number check in copy_oldmem_page

Liu Ping Fan (1):
      powerpc/ftrace: bugfix for test_24bit_addr

Paul Mackerras (1):
      powerpc: Increase stack redzone for 64-bit userspace to 512 bytes

Tony Breeds (1):
      powerpc/le: Ensure that the 'stop-self' RTAS token is handled correctly

 arch/powerpc/include/asm/compat.h            |   5 +-
 arch/powerpc/include/asm/opal.h              |   4 +-
 arch/powerpc/include/asm/ptrace.h            |  16 +-
 arch/powerpc/kernel/crash_dump.c             |   8 +-
 arch/powerpc/kernel/ftrace.c                 |   1 +
 arch/powerpc/kernel/signal_64.c              |   4 +-
 arch/powerpc/platforms/powernv/eeh-ioda.c    |  96 ++++++------
 arch/powerpc/platforms/powernv/opal-xscom.c  |  21 +--
 arch/powerpc/platforms/powernv/pci.c         | 220 +++++++++++++++------------
 arch/powerpc/platforms/pseries/hotplug-cpu.c |  22 +--
 10 files changed, 219 insertions(+), 178 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some more powerpc fixes for 3.14

The main one is a nasty issue with the NUMA balancing support
which requires a small generic change and the addition of a new
accessor to set _PAGE_NUMA. Both have been reviewed and acked by
Mel and Rik.

The changelog should have plenty of details but basically,
without this fix, we get random user segfaults and/or
corruptions due to missing TLB/hash flushes. Aneesh series
of 3 patches fixes it.

We have some vDSO vs. perf fixes from Anton, some small EEH
fixes from Gavin, a ppc32 regression vs. the stack overflow
detector, and a fix for the way we handle PCIe host bridge
speed settings on pseries (which is needed for proper
operations of AMD graphics cards on Power8).

Cheers,
Ben.

The following changes since commit cd15b048445d0a54f7147c35a86c5a16ef231554:

  powerpc/powernv: Add iommu DMA bypass support for IODA2 (2014-02-11 16:07:37 +1100)

are available in the git repository at:

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

for you to fetch changes up to 66f9af83e56bfa12964d251df9d60fb571579913:

  powerpc/eeh: Disable EEH on reboot (2014-02-17 11:19:39 +1100)

----------------------------------------------------------------
Aneesh Kumar K.V (3):
      powerpc/mm: Add new "set" flag argument to pte/pmd update function
      mm: Dirty accountable change only apply to non prot numa case
      mm: Use ptep/pmdp_set_numa() for updating _PAGE_NUMA bit

Anton Blanchard (2):
      powerpc: Link VDSOs at 0x0
      powerpc: Use unstripped VDSO image for more accurate profiling data

Gavin Shan (3):
      powerpc/powernv: Rework EEH reset
      powerpc/eeh: Cleanup on eeh_subsystem_enabled
      powerpc/eeh: Disable EEH on reboot

Kevin Hao (1):
      powerpc: Set the correct ksp_limit on ppc32 when switching to irq stack

Kleber Sacilotto de Souza (2):
      powerpc/pseries: Fix regression on PCI link speed
      powerpc/pseries: Add Gen3 definitions for PCIE link speed

 arch/powerpc/include/asm/eeh.h               | 21 +++++++++++++--
 arch/powerpc/include/asm/hugetlb.h           |  2 +-
 arch/powerpc/include/asm/pgtable-ppc64.h     | 26 +++++++++++--------
 arch/powerpc/include/asm/pgtable.h           | 22 ++++++++++++++++
 arch/powerpc/include/asm/vdso.h              |  6 ++---
 arch/powerpc/kernel/eeh.c                    | 32 ++++++++++++++++++-----
 arch/powerpc/kernel/misc_32.S                |  5 +++-
 arch/powerpc/kernel/vdso32/vdso32_wrapper.S  |  2 +-
 arch/powerpc/kernel/vdso64/vdso64_wrapper.S  |  2 +-
 arch/powerpc/mm/pgtable_64.c                 | 12 +++++----
 arch/powerpc/mm/subpage-prot.c               |  2 +-
 arch/powerpc/platforms/powernv/eeh-ioda.c    | 32 +++++------------------
 arch/powerpc/platforms/powernv/eeh-powernv.c |  2 +-
 arch/powerpc/platforms/pseries/eeh_pseries.c |  2 +-
 arch/powerpc/platforms/pseries/pci.c         | 22 +++++++++++-----
 include/asm-generic/pgtable.h                | 39 ++++++++++++++++++++++++++++
 mm/huge_memory.c                             |  9 ++-----
 mm/mprotect.c                                | 25 ++++++------------
 18 files changed, 172 insertions(+), 91 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here is some powerpc goodness for -rc2. Arguably -rc1 material more than
-rc2 but I was travelling (again !)

It's mostly bug fixes including regressions, but there are a couple of
new things that I decided to drop-in.

One is a straightforward patch from Michael to add a bunch of P8 cache
events to perf.

The other one is a patch by myself to add the direct DMA (iommu bypass)
for PCIe on Power8 for 64-bit capable devices. This has been around for
a while, I had lost track of it. However it's been in our internal
kernels we use for testing P8 already and it affects only P8 related
code. Since P8 is still unreleased the risk is pretty much nil at this
point.

Cheers,
Ben.

The following changes since commit b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed:

  Linux 3.14-rc2 (2014-02-09 18:15:47 -0800)

are available in the git repository at:

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

for you to fetch changes up to cd15b048445d0a54f7147c35a86c5a16ef231554:

  powerpc/powernv: Add iommu DMA bypass support for IODA2 (2014-02-11 16:07:37 +1100)

----------------------------------------------------------------
Anshuman Khandual (1):
      powerpc/perf: Configure BHRB filter before enabling PMU interrupts

Anton Blanchard (1):
      powerpc: Fix endian issues in kexec and crash dump code

Benjamin Herrenschmidt (1):
      powerpc/powernv: Add iommu DMA bypass support for IODA2

Kevin Hao (1):
      powerpc/ppc32: Fix the bug in the init of non-base exception stack for UP

Laurent Dufour (1):
      powerpc/relocate fix relocate processing in LE mode

Mahesh Salgaonkar (2):
      powerpc/pseries: Disable relocation on exception while going down during crash.
      powerpc: Fix kdump hang issue on p8 with relocation on exception enabled.

Michael Ellerman (5):
      powerpc/perf: Add Power8 cache & TLB events
      powerpc/pseries: Select ARCH_RANDOM on pseries
      powerpc/xmon: Don't loop forever in get_output_lock()
      powerpc/xmon: Fix timeout loop in get_output_lock()
      powerpc/xmon: Don't signal we've entered until we're finished printing

Nathan Fontenot (1):
      crypto/nx/nx-842: Fix handling of vmalloc addresses

Paul Gortmaker (1):
      powerpc: Fix build failure in sysdev/mpic.c for MPIC_WEIRD=y

Thadeu Lima de Souza Cascardo (1):
      powerpc/eeh: Drop taken reference to driver on eeh_rmv_device

 arch/powerpc/include/asm/dma-mapping.h    |   1 +
 arch/powerpc/include/asm/iommu.h          |   1 +
 arch/powerpc/include/asm/sections.h       |  12 +++
 arch/powerpc/kernel/dma.c                 |  10 ++-
 arch/powerpc/kernel/eeh_driver.c          |   8 +-
 arch/powerpc/kernel/iommu.c               |  12 +++
 arch/powerpc/kernel/irq.c                 |   5 ++
 arch/powerpc/kernel/machine_kexec.c       |  14 ++-
 arch/powerpc/kernel/machine_kexec_64.c    |   6 +-
 arch/powerpc/kernel/reloc_64.S            |   4 +-
 arch/powerpc/kernel/setup_32.c            |   5 ++
 arch/powerpc/mm/hash_utils_64.c           |  14 +++
 arch/powerpc/perf/core-book3s.c           |   5 +-
 arch/powerpc/perf/power8-pmu.c            | 144 ++++++++++++++++++++++++++++++
 arch/powerpc/platforms/powernv/pci-ioda.c |  84 +++++++++++++++++
 arch/powerpc/platforms/powernv/pci.c      |  10 +++
 arch/powerpc/platforms/powernv/pci.h      |   6 +-
 arch/powerpc/platforms/powernv/powernv.h  |   8 ++
 arch/powerpc/platforms/powernv/setup.c    |   9 ++
 arch/powerpc/platforms/pseries/Kconfig    |   1 +
 arch/powerpc/platforms/pseries/setup.c    |   3 +-
 arch/powerpc/sysdev/mpic.c                |  38 ++++----
 arch/powerpc/xmon/xmon.c                  |  24 +++--
 drivers/crypto/nx/nx-842.c                |  29 +++---
 24 files changed, 398 insertions(+), 55 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This is the patch that I had sent after -rc8 and which we decided
to wait before merging. It's based on a different tree than my
-next branch (it needs some pre-reqs that were in -rc4 or so while
my -next is based on -rc1) so I left it as a separate branch for
your to pull. It's identical to the request I did 2 or 3 weeks back.

This fixes crashes in mremap with THP on powerpc.

The fix however requires a small change in the generic code. It moves a
condition into a helper we can override from the arch which is harmless,
but it *also* slightly changes the order of the set_pmd and the withdraw
& deposit, which should be fine according to Kirill (who wrote that
code) but I agree -rc8 is a bit late...

It was acked by Kirill and Andrew told me to just merge it via powerpc.

Cheers,
Ben.

The following changes since commit a6da83f98267bc8ee4e34aa899169991eb0ceb93:

  Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2014-01-13 10:59:05 +0700)

are available in the git repository at:


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

for you to fetch changes up to b3084f4db3aeb991c507ca774337c7e7893ed04f:

  powerpc/thp: Fix crash on mremap (2014-01-15 15:46:38 +1100)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc/thp: Fix crash on mremap

 arch/powerpc/include/asm/pgtable-ppc64.h | 14 ++++++++++++++
 include/asm-generic/pgtable.h            | 12 ++++++++++++
 mm/huge_memory.c                         | 14 +++++---------
 3 files changed, 31 insertions(+), 9 deletions(-)

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

[Benjamin Herrenschmidt]

On Wed, 2014-01-15 at 15:05 +0700, Linus Torvalds wrote:
> On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
> >
> > My original intend was to put it in powerpc-next and then shoot it to
> > stable, but it got a tad annoying (due to churn it needs to be applied
> > at least on rc4 or later while my next is at rc1 and clean that way), so
> > I put it in the merge branch.
> 
> Quite frankly, I'll prefer to not merge it now, and then 3.13 will get
> it from stable, when it does things like this.
> 
> Partly because it fixes a power-only bug, but potentially changes
> non-power behavior. If it was all in arch/powerpc, I wouldn't mind.

Right, I wasn't too comfortable either. I'll resend the pull request
after the merge window is open.

Cheers,
Ben.

>                Linus
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

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

[Linus Torvalds]

On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> My original intend was to put it in powerpc-next and then shoot it to
> stable, but it got a tad annoying (due to churn it needs to be applied
> at least on rc4 or later while my next is at rc1 and clean that way), so
> I put it in the merge branch.

Quite frankly, I'll prefer to not merge it now, and then 3.13 will get
it from stable, when it does things like this.

Partly because it fixes a power-only bug, but potentially changes
non-power behavior. If it was all in arch/powerpc, I wouldn't mind.

               Linus

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

So you make the call onto whether taking that one now or waiting for the
merge window. It's a bug fix for a crash in mremap that occurs on
powerpc with THP enabled.

The fix however requires a small change in the generic code. It moves a
condition into a helper we can override from the arch which is harmless,
but it *also* slightly changes the order of the set_pmd and the withdraw
& deposit, which should be fine according to Kirill (who wrote that
code) but I agree -rc8 is a bit late...

It was acked by Kirill and Andrew told me to just merge it via powerpc.

My original intend was to put it in powerpc-next and then shoot it to
stable, but it got a tad annoying (due to churn it needs to be applied
at least on rc4 or later while my next is at rc1 and clean that way), so
I put it in the merge branch.

>From there, you tell me if you want to take it now, if not, I'll send
you that branch along with my normal next one after you open the merge
window.

Cheers,
Ben.

The following changes since commit a6da83f98267bc8ee4e34aa899169991eb0ceb93:

  Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2014-01-13 10:59:05 +0700)

are available in the git repository at:


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

for you to fetch changes up to b3084f4db3aeb991c507ca774337c7e7893ed04f:

  powerpc/thp: Fix crash on mremap (2014-01-15 15:46:38 +1100)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc/thp: Fix crash on mremap

 arch/powerpc/include/asm/pgtable-ppc64.h | 14 ++++++++++++++
 include/asm-generic/pgtable.h            | 12 ++++++++++++
 mm/huge_memory.c                         | 14 +++++---------
 3 files changed, 31 insertions(+), 9 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's one regression fix for 3.13 that I would appreciate if you could still
pull in. It was an "interesting" one to debug, basically it's an old bug that
got somewhat "exposed" by new code breaking the boot on PA Semi boards (yes,
it does appear that some people are still using these !).

Cheers,
Ben.

The following changes since commit f991db1cf1bdca43675b5d2df0af991719727029:

  Merge remote-tracking branch 'agust/merge' into merge (2013-12-30 14:48:27 +1100)

are available in the git repository at:


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

for you to fetch changes up to 10348f5976830e5d8f74e8abb04a9a057a5e8478:

  powerpc: Check return value of instance-to-package OF call (2014-01-13 09:49:17 +1100)

----------------------------------------------------------------
Benjamin Herrenschmidt (1):
      powerpc: Check return value of instance-to-package OF call

 arch/powerpc/kernel/prom_init.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc fixes for 3.13. A bit more endian
problems found during testing of 3.13 and a few other simple fixes
and regressions fixes.

Cheers,
Ben.

The following changes since commit 803c2d2f84da9dc2619449994af34d27148ab20d:

  powerpc/powernv: Fix OPAL LPC access in Little Endian (2013-12-13 15:55:15 +1100)

are available in the git repository at:

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

for you to fetch changes up to f991db1cf1bdca43675b5d2df0af991719727029:

  Merge remote-tracking branch 'agust/merge' into merge (2013-12-30 14:48:27 +1100)

----------------------------------------------------------------

Anton Blanchard (1):
      powerpc: Align p_end

Brian W Hart (2):
      powernv/eeh: Fix possible buffer overrun in ioda_eeh_phb_diag()
      powernv/eeh: Add buffer for P7IOC hub error data

Gerhard Sittig (1):
      powerpc/512x: dts: remove misplaced IRQ spec from 'soc' node (5125)

Matteo Facchinetti (1):
      powerpc/512x: dts: disable MPC5125 usb module

Michael Neuling (1):
      powerpc: Fix bad stack check in exception entry

Olof Johansson (1):
      powerpc: Fix alignment of secondary cpu spin vars

Paul E. McKenney (1):
      powerpc: Make 64-bit non-VMX __copy_tofrom_user bi-endian

Rajesh B Prathipati (1):
      powerpc: Make unaligned accesses endian-safe for powerpc

 arch/powerpc/boot/dts/mpc5125twr.dts      |  6 +++-
 arch/powerpc/include/asm/exception-64s.h  |  2 +-
 arch/powerpc/include/asm/unaligned.h      |  7 +++-
 arch/powerpc/kernel/head_64.S             |  2 ++
 arch/powerpc/lib/copyuser_64.S            | 53 ++++++++++++++++++++++---------
 arch/powerpc/platforms/powernv/eeh-ioda.c | 20 +++---------
 arch/powerpc/platforms/powernv/pci.h      |  4 ++-
 7 files changed, 60 insertions(+), 34 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some more powerpc fixes for 3.13.

Uli's patch fixes a regression in ptrace caused by a mis-merge of
a previous LE patch. The rest are all more endian fixes, all fairly
trivial, found during testing of 3.13-rc's.

Cheers,
Ben.

The following changes since commit e641eb03ab2b0f065fa5e64b4202fb5b0441b427:

  powerpc: Fix up the kdump base cap to 128M (2013-12-10 11:28:39 +1100)

are available in the git repository at:

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

for you to fetch changes up to 803c2d2f84da9dc2619449994af34d27148ab20d:

  powerpc/powernv: Fix OPAL LPC access in Little Endian (2013-12-13 15:55:15 +1100)

----------------------------------------------------------------
Anton Blanchard (8):
      powerpc: Fix endian issue in setup-common.c
      powerpc: Fix topology core_id endian issue on LE builds
      powerpc/pseries: Fix endian issues in /proc/ppc64/lparcfg
      powerpc/pseries: Fix endian issues in nvram code
      powerpc/pseries: Fix PCIE link speed endian issue
      powerpc/pseries: Fix endian issues in MSI code
      powerpc: Fix endian issues in crash dump code
      powerpc/powernv: Fix endian issue in opal_xscom_read

Benjamin Herrenschmidt (1):
      powerpc/powernv: Fix OPAL LPC access in Little Endian

Ulrich Weigand (1):
      powerpc: PTRACE_PEEKUSR always returns FPR0

 arch/powerpc/include/asm/opal.h             |  4 +--
 arch/powerpc/kernel/crash_dump.c            |  6 ++--
 arch/powerpc/kernel/ptrace.c                |  4 +--
 arch/powerpc/kernel/setup-common.c          |  4 +--
 arch/powerpc/kernel/smp.c                   |  4 +--
 arch/powerpc/platforms/powernv/opal-lpc.c   | 12 ++++----
 arch/powerpc/platforms/powernv/opal-xscom.c |  4 ++-
 arch/powerpc/platforms/pseries/lparcfg.c    | 12 ++++----
 arch/powerpc/platforms/pseries/msi.c        | 28 ++++++++++--------
 arch/powerpc/platforms/pseries/nvram.c      | 46 ++++++++++++++---------------
 arch/powerpc/platforms/pseries/pci.c        |  8 ++---
 11 files changed, 68 insertions(+), 64 deletions(-)

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

[Benjamin Herrenschmidt]

On Mon, 2013-12-09 at 19:58 -0800, Linus Torvalds wrote:
> On Mon, Dec 9, 2013 at 5:57 PM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
> >
> > Here are a handful of powerpc fixes for 3.13.
> 
> Grr.
> 
> I've pulled it, but looking at that history, it's just pure and utter
> f*cking garbage.
> 
> It was rebased *minutes* before sending it, as far as I can tell. Why?

It was *created* shortly before sending it:

Basically I put that thing together as a patchwork bundle which I grew
over this week.

Today I just applied them to my git, ran my build testers, booted a
machine to dbl check and sent. I tend to not let things linger long in
git when it's just fixes like that.

> And it has a pointless merge that you must have created with "--no-ff"
> for no apparent good reason.

Oh that's my fault. I thought you preferred that way to keep track of
cases where I pull from somebody since then the patch don't have my
s-o-b... my bad for misunderstanding that part of the process.

> WTF? What the hell happened here, and why? As mentioned, it's in my
> tree, but I was *this* close to just unpulling and saying "fuck that"
> when I started looking at it.

Heh sorry.

Cheers,
Ben.

> 
>               Linus
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

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

[Linus Torvalds]

On Mon, Dec 9, 2013 at 5:57 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> Here are a handful of powerpc fixes for 3.13.

Grr.

I've pulled it, but looking at that history, it's just pure and utter
f*cking garbage.

It was rebased *minutes* before sending it, as far as I can tell. Why?

And it has a pointless merge that you must have created with "--no-ff"
for no apparent good reason.

WTF? What the hell happened here, and why? As mentioned, it's in my
tree, but I was *this* close to just unpulling and saying "fuck that"
when I started looking at it.

              Linus

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a handful of powerpc fixes for 3.13.

The patches are reasonably trivial and self contained. Note the
offb patches outside of arch/powerpc, they are LE fixes for our
open-firmware "dumb" framebuffer.

Cheers,
Ben.

The following changes since commit 721cb59e9d95eb7f47ec73711ed35ef85e1ea1ca:

  powerpc/windfarm: Fix XServe G5 fan control Makefile issue (2013-11-27 11:35:47 +1100)

are available in the git repository at:

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

for you to fetch changes up to e641eb03ab2b0f065fa5e64b4202fb5b0441b427:

  powerpc: Fix up the kdump base cap to 128M (2013-12-10 11:28:39 +1100)

----------------------------------------------------------------
Anatolij Gustschin (1):
      powerpc/52xx: Re-enable bestcomm driver in defconfigs

Cedric Le Goater (2):
      offb: Little endian fixes
      offb: Add palette hack for little endian

Gerhard Sittig (1):
      powerpc/512x: dts: remove misplaced IRQ spec from 'soc' node

Hong H. Pham (1):
      powerpc: Fix PTE page address mismatch in pgtable ctor/dtor

Ilia Mirkin (1):
      powerpc/44x: Fix ocm_block allocation

Mahesh Salgaonkar (1):
      powerpc: Fix up the kdump base cap to 128M

Michael Ellerman (1):
      powerpc: Fix build break with PPC_EARLY_DEBUG_BOOTX=y

Olof Johansson (1):
      powerpc/pasemi: Turn on devtmpfs in defconfig

Thadeu Lima de Souza Cascardo (1):
      powernv: Fix VFIO support with PHB3

 arch/powerpc/boot/dts/mpc5121.dtsi            |  1 -
 arch/powerpc/configs/52xx/cm5200_defconfig    |  3 ++-
 arch/powerpc/configs/52xx/lite5200b_defconfig |  3 ++-
 arch/powerpc/configs/52xx/motionpro_defconfig |  3 ++-
 arch/powerpc/configs/52xx/pcm030_defconfig    |  3 ++-
 arch/powerpc/configs/52xx/tqm5200_defconfig   |  3 ++-
 arch/powerpc/configs/mpc5200_defconfig        |  3 ++-
 arch/powerpc/configs/pasemi_defconfig         |  7 +++----
 arch/powerpc/include/asm/pgalloc-32.h         |  6 ++----
 arch/powerpc/include/asm/pgalloc-64.h         |  6 ++----
 arch/powerpc/kernel/machine_kexec.c           |  2 +-
 arch/powerpc/kernel/misc_64.S                 |  5 ++++-
 arch/powerpc/platforms/powernv/pci-ioda.c     |  1 +
 arch/powerpc/sysdev/ppc4xx_ocm.c              |  2 +-
 drivers/video/offb.c                          | 29 +++++++++++++++++++--------
 15 files changed, 47 insertions(+), 30 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few powerpc bug fixes post -rc1. The main thing that caused
problem was that CONFIG_CPU_LITTLE_ENDIAN got turned on with allyesconfig
and such, which is not a very good idea especially since it requires a
newer toolchain than what most people have. So we turned it into a
choice instead that defaults to big endian.

Cheers,
Ben.

The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:

  Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)

are available in the git repository at:

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

for you to fetch changes up to 721cb59e9d95eb7f47ec73711ed35ef85e1ea1ca:

  powerpc/windfarm: Fix XServe G5 fan control Makefile issue (2013-11-27 11:35:47 +1100)

----------------------------------------------------------------
Adam Borowski (1):
      powerpc/85xx: typo in dts: "interupt" (four devices)

Anton Blanchard (1):
      powerpc: allyesconfig should not select CONFIG_CPU_LITTLE_ENDIAN

Benjamin Herrenschmidt (2):
      Merge remote-tracking branch 'scott/master' into merge
      powerpc/windfarm: Fix XServe G5 fan control Makefile issue

Chen Gang (1):
      arch/powerpc/kernel: Use %12.12s instead of %12s to avoid memory overflow

Hari Bathini (1):
      powerpc/kdump: Adding symbols in vmcoreinfo to facilitate dump filtering

LEROY Christophe (1):
      powerpc/8xx: mfspr SPRN_TBRx in lieu of mftb/mftbu is not supported

Michael Neuling (2):
      powerpc: Fix error when cross building TAGS & cscope
      powerpc/signals: Improved mark VSX not saved with small contexts fix

Scott Wood (1):
      powerpc/booke: Only check for hugetlb in flush if vma != NULL

Tiejun Chen (1):
      powerpc/corenet64: compile with CONFIG_E{5,6}500_CPU well

 arch/powerpc/Makefile                     |  7 +++++++
 arch/powerpc/boot/dts/xcalibur1501.dts    |  4 ++--
 arch/powerpc/boot/dts/xpedite5301.dts     |  4 ++--
 arch/powerpc/boot/dts/xpedite5330.dts     |  4 ++--
 arch/powerpc/boot/dts/xpedite5370.dts     |  4 ++--
 arch/powerpc/boot/util.S                  | 14 ++++++++++++++
 arch/powerpc/include/asm/pgalloc-64.h     |  1 +
 arch/powerpc/include/asm/ppc_asm.h        |  2 ++
 arch/powerpc/include/asm/reg.h            |  7 +++++++
 arch/powerpc/include/asm/timex.h          |  8 ++++++++
 arch/powerpc/kernel/machine_kexec.c       | 12 ++++++++++++
 arch/powerpc/kernel/nvram_64.c            |  2 +-
 arch/powerpc/kernel/signal_32.c           | 16 +++++++---------
 arch/powerpc/kernel/signal_64.c           |  6 ++++++
 arch/powerpc/kernel/vdso32/gettimeofday.S |  6 ++++++
 arch/powerpc/mm/hugetlbpage-book3e.c      |  3 +--
 arch/powerpc/mm/tlb_nohash.c              |  2 +-
 arch/powerpc/platforms/Kconfig.cputype    | 20 +++++++++++++++++---
 drivers/macintosh/Makefile                |  1 +
 19 files changed, 99 insertions(+), 24 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Since you pulled my previous one in less than 20mn (the LE stuff),
there's no point waiting for tomorrow for these fixes I mentioned
earlier so here they are.

This is a small collection of random bug fixes and a few improvements
of Oops output which I deemed valuable enough to include as well.

The fixes are essentially recent build breakage and regressions,
and a couple of older bugs such as the DTL log duplication, the
EEH issue with PCI_COMMAND_MASTER and the problem with small
contexts passed to get/set_context with VSX enabled.

Cheers,
Ben.
The following changes since commit b4789b8e6be3151a955ade74872822f30e8cd914:

  aacraid: prevent invalid pointer dereference (2013-11-19 16:27:39 -0800)

are available in the git repository at:

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

for you to fetch changes up to c13f20ac48328b05cd3b8c19e31ed6c132b44b42:

  powerpc/signals: Mark VSX not saved with small contexts (2013-11-21 10:33:45 +1100)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc: booke: Fix build failures

Anton Blanchard (5):
      powerpc: Print DAR and DSISR on machine check oopses
      powerpc: Remove a few lines of oops output
      powerpc/pseries: Duplicate dtl entries sometimes sent to userspace
      powerpc: Only print PACATMSCRATCH in oops when TM is active
      powerpc: ppc64 address space capped at 32TB, mmap randomisation disabled

Gavin Shan (2):
      powerpc/eeh: Enable PCI_COMMAND_MASTER for PCI bridges
      powerpc/eeh: More accurate log

Heiko Carstens (1):
      powerpc: Fix __get_user_pages_fast() irq handling

Li Zhong (1):
      powerpc/vio: Fix a dma_mask issue of vio

Michael Ellerman (2):
      powerpc: Make cpu_to_chip_id() available when SMP=n
      powerpc/pseries: Fix SMP=n build of rng.c

Michael Neuling (1):
      powerpc/signals: Mark VSX not saved with small contexts

 arch/powerpc/include/asm/smp.h        |  2 +-
 arch/powerpc/kernel/eeh.c             |  9 +++++++++
 arch/powerpc/kernel/eeh_event.c       |  9 +++++++--
 arch/powerpc/kernel/process.c         | 21 +++++++++++----------
 arch/powerpc/kernel/prom.c            | 20 ++++++++++++++++++++
 arch/powerpc/kernel/signal_32.c       | 10 +++++++++-
 arch/powerpc/kernel/smp.c             | 16 ----------------
 arch/powerpc/kernel/time.c            |  4 ++--
 arch/powerpc/kernel/vio.c             |  2 +-
 arch/powerpc/mm/gup.c                 |  5 +++--
 arch/powerpc/mm/slice.c               |  2 +-
 arch/powerpc/platforms/powernv/rng.c  |  1 +
 arch/powerpc/platforms/pseries/rng.c  |  1 +
 arch/powerpc/platforms/wsp/chroma.c   |  1 +
 arch/powerpc/platforms/wsp/h8.c       |  1 +
 arch/powerpc/platforms/wsp/ics.c      |  2 ++
 arch/powerpc/platforms/wsp/opb_pic.c  |  2 ++
 arch/powerpc/platforms/wsp/psr2.c     |  1 +
 arch/powerpc/platforms/wsp/scom_wsp.c |  1 +
 arch/powerpc/platforms/wsp/wsp.c      |  1 +
 20 files changed, 75 insertions(+), 36 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

With my previous pull request I mentioned some remaining Little Endian
patches, notably support for our new ABI, which I was sitting on making
sure it was all finalized.

The toolchain folks confirmed it now, the new ABI is stable and merged
with gcc, so we are all good. Oh and we actually missed the actual
Kconfig switch for LE so here it is, along with a couple more bug fixes.

I have more fixes but not related to LE so I'll send them as a separate
pull request tomorrow, let's get this one out of the way.

Note that this supports running user space binaries using the new ABI,
but the kernel itself still needs to be built with the old one. We'll
bring fixes for that after -rc1.

Here's Anton log that goes with this series:

<<<
This patch series adds support for the new ABI, LPAR support
for H_SET_MODE and finally adds a kconfig option and defconfig.

ABIv2 support was recently committed to binutils and gcc, and
should be merged into glibc soon. There are a number of
very nice improvements including the removal of function
descriptors. Rusty's kernel patches allow binaries of either
ABI to work, easing the transition.
>>>

Cheers,
Ben.

The following changes since commit 0c4888ef1d8a8b82c29075ce7e257ff795af15c7:

  powerpc: Fix fatal SLB miss when restoring PPR (2013-11-06 14:13:53 +1100)

are available in the git repository at:

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

for you to fetch changes up to 280270828f108be56f0c486def58acabb070244f:

  powerpc: Wrong DWARF CFI in the kernel vdso for little-endian / ELFv2 (2013-11-21 09:19:23 +1100)

----------------------------------------------------------------
Alistair Popple (1):
      powerpc: Don't use ELFv2 ABI to build the kernel

Anton Blanchard (4):
      powerpc/pseries: Fix endian issues in pseries EEH code
      pseries: Add H_SET_MODE to change exception endianness
      powerpc: Add CONFIG_CPU_LITTLE_ENDIAN kernel config option.
      powerpc: Add pseries_le_defconfig

Rusty Russell (4):
      powerpc: Add TIF_ELF2ABI flag.
      powerpc: Set eflags correctly for ELF ABIv2 core dumps.
      powerpc: ELF2 binaries launched directly.
      powerpc: ELF2 binaries signal handling

Ulrich Weigand (1):
      powerpc: Wrong DWARF CFI in the kernel vdso for little-endian / ELFv2

 arch/powerpc/Makefile                        |   1 +
 arch/powerpc/configs/pseries_le_defconfig    | 352 +++++++++++++++++++++++++++
 arch/powerpc/include/asm/elf.h               |   4 +
 arch/powerpc/include/asm/hvcall.h            |   2 +
 arch/powerpc/include/asm/plpar_wrappers.h    |  26 ++
 arch/powerpc/include/asm/thread_info.h       |   9 +
 arch/powerpc/kernel/process.c                |  50 ++--
 arch/powerpc/kernel/signal_64.c              |  25 +-
 arch/powerpc/kernel/vdso64/sigtramp.S        |  16 +-
 arch/powerpc/platforms/Kconfig.cputype       |  11 +
 arch/powerpc/platforms/pseries/eeh_pseries.c |  21 +-
 arch/powerpc/platforms/pseries/lpar.c        |  17 ++
 arch/powerpc/platforms/pseries/setup.c       |  42 ++++
 13 files changed, 542 insertions(+), 34 deletions(-)
 create mode 100644 arch/powerpc/configs/pseries_le_defconfig

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few powerpc fixes, all aimed at -stable, found in part thanks
to the ramping up of a major distro testing and in part thanks to the LE
guys hitting all sort interesting corner cases.

The most scary are probably the register clobber issues in
csum_partial_copy_generic(), especially since Anton even had a test case
for that thing, which didn't manage to hit the bugs :-)

Another highlight is that memory hotplug should work again with these
fixes.

Oh and the vio modalias one is worse than the cset implies as it upsets
distro installers, so I've been told at least, which is why I'm shooting
it to stable.

Cheers,
Ben.

The following changes since commit 4b97280675f45c1650ee4e388bd711ecbb18c4b4:

  Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (2013-09-25 15:50:53 -0700)

are available in the git repository at:


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

for you to fetch changes up to e9bdc3d6143d1c4b8d8ce5231fc958268331f983:

  powerpc/tm: Switch out userspace PPR and DSCR sooner (2013-10-03 17:25:51 +1000)

----------------------------------------------------------------
Madhavan Srinivasan (1):
      powerpc/sysfs: Disable writing to PURR in guest mode

Michael Ellerman (1):
      powerpc/perf: Fix handling of FAB events

Michael Neuling (2):
      powerpc/tm: Turn interrupts hard off in tm_reclaim()
      powerpc/tm: Switch out userspace PPR and DSCR sooner

Nathan Fontenot (1):
      powerpc: Fix memory hotplug with sparse vmemmap

Nishanth Aravamudan (1):
      powerpc/iommu: Use GFP_KERNEL instead of GFP_ATOMIC in iommu_init_table()

Paul E. McKenney (2):
      powerpc: Fix parameter clobber in csum_partial_copy_generic()
      powerpc: Restore registers on error exit from csum_partial_copy_generic()

Prarit Bhargava (1):
      powerpc/vio: Fix modalias_show return values

 arch/powerpc/kernel/iommu.c    |  2 +-
 arch/powerpc/kernel/sysfs.c    | 18 +++++++-
 arch/powerpc/kernel/tm.S       | 95 ++++++++++++++++++++++++++++--------------
 arch/powerpc/kernel/vio.c      | 12 ++++--
 arch/powerpc/lib/checksum_64.S | 58 +++++++++++++++++++-------
 arch/powerpc/mm/init_64.c      |  4 ++
 arch/powerpc/mm/mem.c          |  9 ++++
 arch/powerpc/perf/power8-pmu.c |  5 ++-
 mm/Kconfig                     |  2 +-
 9 files changed, 148 insertions(+), 57 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few things for -rc2, this time it's all written by me so it
can only be perfect .... right ? :)

So we have the fix to call irq_enter/exit on the irq stack we've been
discussing, plus a cleanup on top to remove an unused (and broken)
stack limit tracking feature (well, make it 32-bit only in fact where
it is used and works properly).

Then we have two things that I wrote over the last couple of days and
made the executive decision to include just because I can (and I'm sure
you won't object .... right ?).

They fix a couple of annoying and long standing "issues":

 - We had separate zImages for when booting via Open Firmware vs.
booting via a flat device-tree, while it's trivial to make one that
deals with both

 - We wasted a ton of cycles spinning secondary CPUs uselessly at boot
instead of starting them when needed on pseries, thus contributing
significantly to global warming.

Cheers,
Ben.

The following changes since commit 4a10c2ac2f368583138b774ca41fac4207911983:

  Linux 3.12-rc2 (2013-09-23 15:41:09 -0700)

are available in the git repository at:

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

for you to fetch changes up to dbe78b40118636f2d5d276144239dd4bfd5f04f9:

  powerpc/pseries: Do not start secondaries in Open Firmware (2013-09-25 14:19:00 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (4):
      powerpc/irq: Run softirqs off the top of the irq stack
      powerpc: Remove ksp_limit on ppc64
      powerpc/zImage: make the "OF" wrapper support ePAPR boot
      powerpc/pseries: Do not start secondaries in Open Firmware

 arch/powerpc/boot/Makefile           |   4 +-
 arch/powerpc/boot/epapr-wrapper.c    |   9 ++++
 arch/powerpc/boot/epapr.c            |   4 +-
 arch/powerpc/boot/of.c               |  16 +++++-
 arch/powerpc/boot/wrapper            |   9 ++--
 arch/powerpc/include/asm/irq.h       |   4 +-
 arch/powerpc/include/asm/processor.h |   4 +-
 arch/powerpc/kernel/asm-offsets.c    |   3 +-
 arch/powerpc/kernel/irq.c            | 100 +++++++++++++++--------------------
 arch/powerpc/kernel/misc_32.S        |  25 +++++++--
 arch/powerpc/kernel/misc_64.S        |  10 ++--
 arch/powerpc/kernel/process.c        |   3 +-
 arch/powerpc/kernel/prom_init.c      |  21 ++++++++
 arch/powerpc/lib/sstep.c             |   3 +-
 arch/powerpc/platforms/pseries/smp.c |  26 +++++----
 15 files changed, 147 insertions(+), 94 deletions(-)
 create mode 100644 arch/powerpc/boot/epapr-wrapper.c

	

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a handful of small powerpc fixes. A couple of section mismatches
(always worth fixing), a missing export of a new symbol causing build
failures of modules, a page fault deadlock fix (interestingly that
bug has been around for a LONG time, though it seems to be more easily
triggered by KVM) and fixing pseries default idle loop in the absence of
the cpuidle drivers (such as during boot).

Cheers,
Ben.

The following changes since commit 8d7551eb1916832f2a5b27346edf24e7b2382f67:

  Merge tag 'cris-for-3.12' of git://jni.nu/cris (2013-09-10 14:55:16 -0700)

are available in the git repository at:


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

for you to fetch changes up to 363edbe2614aa90df706c0f19ccfa2a6c06af0be:

  powerpc: Default arch idle could cede processor on pseries (2013-09-11 11:41:54 +1000)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc: Fix possible deadlock on page fault

Guenter Roeck (1):
      powerpc: Export cpu_to_chip_id() to fix build error

Vaidyanathan Srinivasan (1):
      powerpc: Default arch idle could cede processor on pseries

Vladimir Murzin (2):
      powerpc: Fix section mismatch warning for prom_rtas_call
      fbdev/ps3fb: Fix section mismatch warning for ps3fb_probe

 arch/powerpc/kernel/prom_init.c        |  3 ++-
 arch/powerpc/kernel/smp.c              |  1 +
 arch/powerpc/mm/fault.c                | 13 ++++++++++---
 arch/powerpc/platforms/pseries/setup.c | 31 +++++++++++++++++++++----------
 drivers/video/ps3fb.c                  |  2 +-
 5 files changed, 35 insertions(+), 15 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are 3 bug fixes that should probably go into 3.11 since I'm also
tagging them for stable.

Once fixes our old /proc/powerpc/lparcfg file which provides partition
informations when running under our hypervisor and also acts as a
user-triggerable Oops when hot :-(

The other two respectively are a one liner to fix a HVSI protocol
handshake problem causing the console to fail to show up on a bunch of
machines until we reach userspace, which I deem annoying enough to
warrant going to stable, and a nasty gcc miscompile causing us to
pass virtual instead of physical addresses to the firmware under some
circumstances.

Cheers,
Ben.
The following changes since commit 28e61cc466d8daace4b0f04ba2b83e0bd68f5832:

  powerpc/tm: Fix context switching TAR, PPR and DSCR SPRs (2013-08-09 18:07:12 +1000)

are available in the git repository at:

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

for you to fetch changes up to d220980b701d838560a70de691b53be007e99e78:

  powerpc/hvsi: Increase handshake timeout from 200ms to 400ms. (2013-08-27 16:59:56 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (1):
      powerpc: Don't Oops when accessing /proc/powerpc/lparcfg without hypervisor

Eugene Surovegin (1):
      powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.

Paul Mackerras (1):
      powerpc: Work around gcc miscompilation of __pa() on 64-bit

 arch/powerpc/Kconfig            |  1 +
 arch/powerpc/include/asm/page.h | 10 ++++++++++
 arch/powerpc/kernel/lparcfg.c   | 22 +++++++++-------------
 drivers/tty/hvc/hvsi_lib.c      |  4 ++--
 4 files changed, 22 insertions(+), 15 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some powerpc fixes for you.

This includes small series from Michael Neuling to fix a couple of nasty
remaining problems with the new Power8 support, also targeted at stable
3.10, without which some new userspace accessible registers aren't
properly context switched, and in some case, can be clobbered by the
user of transactional memory.

Along with that, a few slightly more minor things, such as a missing
Kconfig option to enable handling of denorm exceptions when not running
under a hypervisor (or userspace will randomly crash when hitting
denorms with the vector unit), some nasty bugs in the new pstore oops
code, and other simple bug fixes worth having in now.

Note: I picked up the two powerpc KVM fixes as Alex Graf asked me to
handle KVM bits while he is on vacation. However I'll let him decide
whether they should go to -stable or not when he is back.

Cheers,
Ben.

The following changes since commit b7bc9e7d808ba55729bd263b0210cda36965be32:

  Merge tag 'trace-fixes-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (2013-08-07 13:01:30 -0700)

are available in the git repository at:


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

for you to fetch changes up to 28e61cc466d8daace4b0f04ba2b83e0bd68f5832:

  powerpc/tm: Fix context switching TAR, PPR and DSCR SPRs (2013-08-09 18:07:12 +1000)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc: On POWERNV enable PPC_DENORMALISATION by default

Aruna Balakrishnaiah (2):
      powerpc/pseries: Fix buffer overflow when reading from pstore
      powerpc/pseries: Add backward compatibilty to read old kernel oops-log

Chen Gang (1):
      powerpc/kvm: Add signed type cast for comparation

Michael Neuling (5):
      powerpc: Fix hypervisor facility unavaliable vector number
      powerpc: Rework setting up H/FSCR bit definitions
      powerpc: Fix context switch DSCR on POWER8
      powerpc: Save the TAR register earlier
      powerpc/tm: Fix context switching TAR, PPR and DSCR SPRs

Mike Qiu (1):
      powerpc/eeh: Add missing procfs entry for PowerNV

Thadeu Lima de Souza Cascardo (1):
      powerpc/kvm/book3s_pr: Return appropriate error when allocation fails

 arch/powerpc/Kconfig                   |  2 +-
 arch/powerpc/include/asm/processor.h   |  4 ++
 arch/powerpc/include/asm/reg.h         | 31 ++++++++-----
 arch/powerpc/include/asm/switch_to.h   |  9 ++++
 arch/powerpc/kernel/asm-offsets.c      |  3 ++
 arch/powerpc/kernel/eeh.c              |  2 +-
 arch/powerpc/kernel/entry_64.S         | 36 ++++++++++-----
 arch/powerpc/kernel/exceptions-64s.S   |  5 ++-
 arch/powerpc/kernel/process.c          | 10 +++++
 arch/powerpc/kernel/tm.S               | 20 +++++++++
 arch/powerpc/kernel/traps.c            | 58 ++++++++++++++----------
 arch/powerpc/kvm/book3s_hv.c           |  4 +-
 arch/powerpc/kvm/book3s_pr.c           |  5 ++-
 arch/powerpc/platforms/pseries/nvram.c | 80 +++++++++++++++-------------------
 14 files changed, 170 insertions(+), 99 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

[ resent in case you missed it ]

Hi Linus !

Here is not quite a handful of powerpc fixes for rc3. The windfarm fix is
a regression fix (though not a new one), the PMU interrupt rename is not
a fix per-se but has been submitted a long time ago and I kept forgetting
to put it in (it puts us back in sync with x86), the other perf bit is
just about putting an API/ABI bit definition in the right place for
userspace to consume, and finally, we have a fix for the VPHN (Virtual
Partition Home Node) feature (notification that the hypervisor is moving
nodes around) which could cause lockups so we may as well fix it now.

Thanks !

Cheers,
Ben.

The following changes since commit ff3d79dc12c2ed38483f6c1e0f26fde430f27c9d:

  powerpc/perf: BHRB filter configuration should follow the task (2013-07-24 14:42:34 +1000)

are available in the git repository at:

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

for you to fetch changes up to fe956a1d4081ce1a959f87df397a15e252201f10:

  powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31) (2013-08-01 13:11:47 +1000)

----------------------------------------------------------------
Aaro Koskinen (1):
      powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)

Michael Ellerman (2):
      powerpc: Rename PMU interrupts from CNT to PMI
      powerpc/perf: Export PERF_EVENT_CONFIG_EBB_SHIFT to userspace

Robert Jennings (1):
      powerpc: VPHN topology change updates all siblings

 arch/powerpc/include/asm/perf_event_server.h |  6 +--
 arch/powerpc/include/asm/smp.h               |  4 ++
 arch/powerpc/include/uapi/asm/Kbuild         |  1 +
 arch/powerpc/include/uapi/asm/perf_event.h   | 18 +++++++++
 arch/powerpc/kernel/irq.c                    |  2 +-
 arch/powerpc/mm/numa.c                       | 59 +++++++++++++++++++++-------
 arch/powerpc/perf/core-book3s.c              |  2 +-
 arch/powerpc/perf/power8-pmu.c               |  6 +--
 drivers/macintosh/windfarm_rm31.c            | 18 ++++-----
 9 files changed, 82 insertions(+), 34 deletions(-)
 create mode 100644 arch/powerpc/include/uapi/asm/perf_event.h

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here is not quite a handful of powerpc fixes for rc3. The windfarm fix is
a regression fix (though not a new one), the PMU interrupt rename is not
a fix per-se but has been submitted a long time ago and I kept forgetting
to put it in (it puts us back in sync with x86), the other perf bit is
just about putting an API/ABI bit definition in the right place for
userspace to consume, and finally, we have a fix for the VPHN (Virtual
Partition Home Node) feature (notification that the hypervisor is moving
nodes around) which could cause lockups so we may as well fix it now.

Thanks !

Cheers,
Ben.

The following changes since commit ff3d79dc12c2ed38483f6c1e0f26fde430f27c9d:

  powerpc/perf: BHRB filter configuration should follow the task (2013-07-24 14:42:34 +1000)

are available in the git repository at:

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

for you to fetch changes up to fe956a1d4081ce1a959f87df397a15e252201f10:

  powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31) (2013-08-01 13:11:47 +1000)

----------------------------------------------------------------
Aaro Koskinen (1):
      powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)

Michael Ellerman (2):
      powerpc: Rename PMU interrupts from CNT to PMI
      powerpc/perf: Export PERF_EVENT_CONFIG_EBB_SHIFT to userspace

Robert Jennings (1):
      powerpc: VPHN topology change updates all siblings

 arch/powerpc/include/asm/perf_event_server.h |  6 +--
 arch/powerpc/include/asm/smp.h               |  4 ++
 arch/powerpc/include/uapi/asm/Kbuild         |  1 +
 arch/powerpc/include/uapi/asm/perf_event.h   | 18 +++++++++
 arch/powerpc/kernel/irq.c                    |  2 +-
 arch/powerpc/mm/numa.c                       | 59 +++++++++++++++++++++-------
 arch/powerpc/perf/core-book3s.c              |  2 +-
 arch/powerpc/perf/power8-pmu.c               |  6 +--
 drivers/macintosh/windfarm_rm31.c            | 18 ++++-----
 9 files changed, 82 insertions(+), 34 deletions(-)
 create mode 100644 arch/powerpc/include/uapi/asm/perf_event.h

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here is a series of powerpc fixes. It's a bit big, mostly because of the
series of 11 "EEH" patches from Gavin. The EEH (Our IBM specific
PCI/PCIe Enhanced Error Handling) code had been rotting for a while and
this merge window saw a significant rework & fixing of it by Gavin Shan.

However, that wasn't complete and left some open issues. There were
still a few corner cases that didn't work properly, for example in
relation to hotplug and devices without explicit error handlers. We had
some patches but they weren't quite good enough yet so I left them off
the 3.11 merge window.

Gavin since then fixed it all up, we ran quite a few rounds of testing
and it seems fairly solid (at least probably more than it has ever
been). This should probably have made -rc1 but both Gavin and I took
some vacation so it had to wait for -rc2.

The rest is more bug fixes, mostly to new features recently added, for
example, we missed the cpu table entry for one of the two models of P8
(we didn't realize they had different PVR [Processor Version Register]
values), some module CRC issues, etc...

Please apply,

Cheers,
Ben.

The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:

  Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)

are available in the git repository at:

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

for you to fetch changes up to ff3d79dc12c2ed38483f6c1e0f26fde430f27c9d:

  powerpc/perf: BHRB filter configuration should follow the task (2013-07-24 14:42:34 +1000)

----------------------------------------------------------------
Aneesh Kumar K.V (2):
      powerpc/mm: Fix fallthrough bug in hpte_decode
      powerpc/mm: Use the correct SLB(LLP) encoding in tlbie instruction

Anshuman Khandual (2):
      powerpc/perf: Ignore separate BHRB privilege state filter request
      powerpc/perf: BHRB filter configuration should follow the task

Anton Blanchard (1):
      powerpc/modules: Module CRC relocation fix causes perf issues

Bjorn Helgaas (1):
      powerpc/powernv: Mark pnv_pci_init_ioda2_phb() as __init

Denis Kirjanov (1):
      powerpc/pseries: Fix a typo in pSeries_lpar_hpte_insert()

Gavin Shan (11):
      powerpc/eeh: Remove reference to PCI device
      powerpc/eeh: Export functions for hotplug
      powerpc/pci: Override pcibios_release_device()
      powerpc/pci/hotplug: Don't need to remove from EEH cache twice
      powerpc/eeh: Keep PE during hotplug
      powerpc/eeh: Use safe list traversal when walking EEH devices
      powerpc/pci: Partial tree hotplug support
      powerpc/eeh: Use partial hotplug for EEH unaware drivers
      powerpc/eeh: Don't use pci_dev during BAR restore
      powerpc/eeh: Fix unbalanced enable for IRQ
      powerpc/eeh: Introdce flag to protect sysfs

Mahesh Salgaonkar (1):
      powerpc: Fix the corrupt r3 error during MCE handling.

Michael Ellerman (1):
      powerpc/perf: Set PPC_FEATURE2_EBB when we register the power8 PMU

Michael Neuling (1):
      powerpc: Add second POWER8 PVR entry

Paul Bolle (1):
      powerpc/pseries: Drop "select HOTPLUG"

Tiejun Chen (1):
      powerpc: Access local paca after hard irq disabled

 arch/powerpc/include/asm/eeh.h               | 30 ++++++++---
 arch/powerpc/include/asm/hw_irq.h            |  7 +--
 arch/powerpc/include/asm/module.h            |  5 +-
 arch/powerpc/include/asm/pci-bridge.h        |  1 -
 arch/powerpc/include/asm/reg.h               |  3 +-
 arch/powerpc/kernel/cputable.c               | 20 +++++++-
 arch/powerpc/kernel/eeh.c                    | 70 ++++++++++++-------------
 arch/powerpc/kernel/eeh_cache.c              | 18 ++-----
 arch/powerpc/kernel/eeh_driver.c             | 77 ++++++++++++++++++++++++++--
 arch/powerpc/kernel/eeh_pe.c                 | 58 +++++++++------------
 arch/powerpc/kernel/eeh_sysfs.c              | 21 ++++++++
 arch/powerpc/kernel/pci-common.c             |  2 +
 arch/powerpc/kernel/pci-hotplug.c            | 49 +++++++++---------
 arch/powerpc/kernel/pci_of_scan.c            | 56 ++++++++++++++------
 arch/powerpc/kernel/prom_init.c              |  5 +-
 arch/powerpc/kernel/vmlinux.lds.S            |  3 --
 arch/powerpc/mm/hash_native_64.c             | 12 ++++-
 arch/powerpc/perf/core-book3s.c              |  5 +-
 arch/powerpc/perf/power8-pmu.c               | 24 +++++----
 arch/powerpc/platforms/powernv/eeh-powernv.c | 17 ++++--
 arch/powerpc/platforms/powernv/pci-ioda.c    |  2 +-
 arch/powerpc/platforms/pseries/Kconfig       |  1 -
 arch/powerpc/platforms/pseries/eeh_pseries.c | 67 ++++++++++++++++++++++--
 arch/powerpc/platforms/pseries/lpar.c        |  2 +-
 arch/powerpc/platforms/pseries/ras.c         |  3 ++
 drivers/pci/hotplug/rpadlpar_core.c          |  1 -
 26 files changed, 390 insertions(+), 169 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Earlier today I mentioned that while we had fixed the kernel crashes,
EEH error recovery didn't always recover... It appears that I had
a fix for that already in powerpc-next (with a stable CC).

I cherry-picked it today and did a few tests and it seems that things
now work quite well. The patch is also pretty simple, so I see no reason
to wait before merging it.

Please pull.

Cheers,
Ben.

The following changes since commit 6c355beafdbd0a62add3a3d89825ca87cf8ecec0:

  Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2013-06-29 17:02:48 -0700)

are available in the git repository at:


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

for you to fetch changes up to ea461abf61753b4b79e625a7c20650105b990f21:

  powerpc/eeh: Fix fetching bus for single-dev-PE (2013-06-30 14:08:34 +1000)

----------------------------------------------------------------
Gavin Shan (1):
      powerpc/eeh: Fix fetching bus for single-dev-PE

 arch/powerpc/platforms/pseries/eeh_pe.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

We discovered some breakage in our "EEH" (PCI Error Handling) code while
doing error injection, due to a couple of regressions. One of them is
due to a patch (37f02195b) that, in hindsight, I shouldn't have merged
considering that it caused more problems than it solved.

Please pull those two fixes. One for a simple EEH address cache
initialization issue. The other one is a patch from Guenter that I had
originally planned to put in 3.11 but which happens to also fix that
other regression (a kernel oops during EEH error handling and possibly
hotplug).

With those two, the couple of test machines I've hammered with error
injection are remaining up now. EEH appears to still fail to recover on
some devices, so there is another problem that Gavin is looking into but
at least it's no longer crashing the kernel.

Cheers,
Ben.

The following changes since commit b37e161388ac3980d5dfb73050e85874b84253eb:

  powerpc/pci: Fix boot panic on mpc83xx (regression) (2013-06-24 16:54:09 -0500)

are available in the git repository at:

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

for you to fetch changes up to 7846de406f43df98ac9864212dcfe3f2816bdb04:

  powerpc/pci: Improve device hotplug initialization (2013-06-30 08:46:46 +1000)

----------------------------------------------------------------
Guenter Roeck (1):
      powerpc/pci: Improve device hotplug initialization

Thadeu Lima de Souza Cascardo (1):
      powerpc/eeh: Add eeh_dev to the cache during boot

 arch/powerpc/kernel/pci-common.c           |   17 ++++++++++++-----
 arch/powerpc/platforms/pseries/eeh_cache.c |    4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This is a fix for a regression causing a freescale "83xx" based platforms
to crash on boot due to some PCI breakage. Please apply.

Cheers,
Ben.

The following changes since commit 17858ca65eef148d335ffd4cfc09228a1c1cbfb5:

  Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (2013-06-18 06:29:19 -1000)

are available in the git repository at:


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

for you to fetch changes up to b37e161388ac3980d5dfb73050e85874b84253eb:

  powerpc/pci: Fix boot panic on mpc83xx (regression) (2013-06-24 16:54:09 -0500)

----------------------------------------------------------------
Rojhalat Ibrahim (1):
      powerpc/pci: Fix boot panic on mpc83xx (regression)

 arch/powerpc/sysdev/fsl_pci.c |   24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Please pull this regression fix into 3.10. We accidentally broke
hugetlbfs on Freescale embedded processors which use a slightly
different page table layout than our server processors.

Cheers,
Ben.

The following changes since commit c0691143dfe1d42ec9bd89de5921ccb6a27ea1b3:

  mn10300: Fix include dependency in irqflags.h et al. (2013-06-19 06:29:54 -1000)

are available in the git repository at:

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

for you to fetch changes up to 8bbd9f04b7d982d1c6aeb5c08f5983b3d0b9e2fe:

  powerpc: Fix bad pmd error with book3E config (2013-06-20 15:25:21 +1000)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc: Fix bad pmd error with book3E config

 arch/powerpc/mm/hugetlbpage.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Hopefully this one smells better ...

So here are 3 fixes still for 3.10. Fixes are simple, bugs are nasty
(though not recent regressions, nasty enough) and all targeted at
stable. Please apply.

Thanks !

Cheers,
Ben.

The following changes since commit 34376a50fb1fa095b9d0636fa41ed2e73125f214:

  Fix lockup related to stop_machine being stuck in __do_softirq. (2013-06-10 17:46:57 -0700)

are available in the git repository at:

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

for you to fetch changes up to 230b3034793247f61e6a0b08c44cf415f6d92981:

  powerpc: Fix missing/delayed calls to irq_work (2013-06-15 12:33:30 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (1):
      powerpc: Fix missing/delayed calls to irq_work

Michael Ellerman (1):
      powerpc: Fix stack overflow crash in resume_kernel when ftracing

Paul Mackerras (1):
      powerpc: Fix emulation of illegal instructions on PowerNV platform

 arch/powerpc/include/asm/exception-64s.h |    2 +-
 arch/powerpc/kernel/exceptions-64s.S     |    2 +-
 arch/powerpc/kernel/irq.c                |    2 +-
 arch/powerpc/kernel/process.c            |    4 ++--
 arch/powerpc/kernel/traps.c              |   10 ++++++++++
 5 files changed, 15 insertions(+), 5 deletions(-)

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

[Linus Torvalds]

On Sun, Jun 9, 2013 at 9:20 PM, Jeremy Kerr <jk@ozlabs.org> wrote:
>
> So, we now use the original date header (if present) in the mbox views:
>
> $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date
> Date: Fri, 7 Jun 2013 15:42:54 +1000
>
> ... for all your data-mining needs.

Goodie, and I see that it even works with old patches. Thanks.

               Linus

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

[Jeremy Kerr]

Hi Linus,

> No. The date from the email was
> 
>     Date: Fri, 7 Jun 2013 15:42:54 +1000
> 
> and we want *that* date.

Ah, gotchya.

So, we now use the original date header (if present) in the mbox views:

$ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date
Date: Fri, 7 Jun 2013 15:42:54 +1000

... for all your data-mining needs.

Cheers,


Jeremy

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

[Linus Torvalds]

On Sun, Jun 9, 2013 at 8:20 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> .. the rationale for this is that the work pattern of people is
> actually interesting information. You can do things like this:
>
>     git log --pretty=%aD --author=Torvalds

Final side note: for me, and other git users that apply other peoples
patches, it's probably better to use

   git log --pretty=%cD --committer=Torvalds

instead.

Interestingly, that shows a different pattern than my "authorship"
statistics, which are mainly pull requests. It turns out I commit
patches much more in the afternoon. The reason is probably simple: in
the mornings, I have pull requests waiting from overnight, so a fair
number of pull requests where I am author at 9-11. But my biggest
source of patches tends to be Andrew Morton, who sends the patches in
the afternoon, so suddenly the commit counts skew towards being
between 3pm-8pm when you take all my commits into accoint.

Doing

    git log --since=6.months --pretty=%aD --grep=Signed.*Andrew.Morton

backs that up: most of the commits that have sign-offs by Andrew are
sent in the afternoon.

I just find details like that really interesting, where you can
actually mine for the workpatterns of people.

                   Linus

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

[Linus Torvalds]

On Sun, Jun 9, 2013 at 8:06 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> And it does matter.

.. the rationale for this is that the work pattern of people is
actually interesting information. You can do things like this:

    git log --pretty=%aD --author=Torvalds

to see what my work pattern is, and I think that's *interesting*.
Gathering statistics like whether people are generally doing 9-5
Mon-Fri is actually interesting data. You can do things like this:

    git log --since=6.months --pretty=%aD --author=Torvalds |
        cut -c1-3 |
        sort |
        uniq -c |
        sort -n

and see (for example) that I do slow down on weekends.

Same goes for things like what time of day ends up being most
productive. You can do the statistics for me, and see that I tend to
do the bulk of my pulls in the mornings (peak between 9-11) and that
I'm not a night-owl (*big* drop-off after 8PM - that's what kids do to
you). You can see a few really early-morning cases, but I suspect they
were when I was jetlagged.

So the date data is actually meaningful data. It's not just random noise.

And to do these kinds of things, you absolutely have to have
local-time with proper timezone information. Anything that screws that
up is *broken*. git gets this right, unlike a lot of other broken
SCM's. Git gets it right for a reason.

Yeah, yeah, when people forward other peoples patches they often drop
the date field, and the date of the patch ends up being the time that
the last version of the patch got sent rather than anything else, so
many of the statistics aren't valid. But a _tool_ that actively
corrupts the date and time of a patch is just broken.

                 Linus

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

[Linus Torvalds]

On Sun, Jun 9, 2013 at 7:44 PM, Jeremy Kerr <jk@ozlabs.org> wrote:
>
> We keep all patch dates in UTC, but were generating the Date header
> incorrectly. Now fixed:

No, not fixed.

Keeping patch dates in UTC *corrupts* the date.

I'll ask people to stop using patchworks if it cannot keep track of
emailed dates. The date very much is a local time WITH A TIMEZONE.

And it does matter.

> $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date
> Date: Fri, 07 Jun 2013 05:42:54 -0000

No. The date from the email was

    Date: Fri, 7 Jun 2013 15:42:54 +1000

and we want *that* date. Not some random date that patchwork makes up
that has no relevance.

I know you have that date, because it shows up when asking for the
headers in patchwork. Just use the right one, don't make up incorrect
ones.

               Linus

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

[Jeremy Kerr]

Hi Linus,

> Is Jeremy the patchwork maintainer?

Yep, that's me.

> and it turns out that apparently 'patchwork' is just making up random
> times, because when you download the email as an mbox, it will turn
> this into that corrupt and incorrect
> 
>     Date: Thu, 06 Jun 2013 19:42:54 -0000
> 
> thing which is apparently how you got the wrong timestamp to begin with.

We keep all patch dates in UTC, but were generating the Date header
incorrectly. Now fixed:

$ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date
Date: Fri, 07 Jun 2013 05:42:54 -0000

Commit is at:

 http://git.ozlabs.org/?p=patchwork;a=commitdiff;h=e7353352

Cheers,


Jeremy

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's the previous pull request with a couple of commits removed,
this is purely regressions (though not all recent ones) or stable
material.

Cheers,
Ben.


The following changes since commit 1612e111e4e565422242727efb59499cce8738e4:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-06-06 18:09:05 -0700)

are available in the git repository at:


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

for you to fetch changes up to b11ae95100f7061b39a15e5c1ecbf862464ac4b4:

  powerpc: Partial revert of "Context switch more PMU related SPRs" (2013-06-10 08:36:35 +1000)

----------------------------------------------------------------
Gavin Shan (1):
      powerpc/eeh: Don't check RTAS token to get PE addr

Kevin Hao (1):
      powerpc/pci: Check the bus address instead of resource address in pcibios_fixup_resources

Michael Ellerman (2):
      powerpc/perf: Fix deadlock caused by calling printk() in PMU exception
      powerpc: Partial revert of "Context switch more PMU related SPRs"

Michael Neuling (4):
      powerpc/power8: Fix oprofile and perf
      powerpc/pseries: Simplify denormalization handler
      powerpc/power8: Update denormalization handler
      powerpc/hw_breakpoints: Add DABRX cpu feature to fix 32-bit regression

 arch/powerpc/include/asm/cputable.h          |   17 +++--
 arch/powerpc/kernel/cputable.c               |    8 +--
 arch/powerpc/kernel/entry_64.S               |   28 --------
 arch/powerpc/kernel/exceptions-64s.S         |   90 ++++++++------------------
 arch/powerpc/kernel/pci-common.c             |    4 +-
 arch/powerpc/kernel/process.c                |    3 +-
 arch/powerpc/perf/core-book3s.c              |    2 +-
 arch/powerpc/platforms/pseries/eeh_pseries.c |   12 ++--
 8 files changed, 51 insertions(+), 113 deletions(-)

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

[Benjamin Herrenschmidt]

On Sun, 2013-06-09 at 14:33 -0700, Linus Torvalds wrote:
> On Sun, Jun 9, 2013 at 12:56 AM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
> >
> > Here are a few more powerpc changes for 3.10. I've merged your
> > tree in at some point (which I generally avoid) in order to get
> > the compat network fixes as soon as possible.
> >
> > Mostly regressions, and stuff I judged could/should still go in at
> > this stage.
> 
> Not pulled, because your hamster smells of eldeberries.
> 
> This is not just bugfixes. In fact, as far as I can tell, this
> *introduces* bugs, with that "get_user()" in the exception path that
> can apparently happen with irqs disabled and will thus potentially
> result in new warnings that just make things unreadable.

Ah right, brown paper bag for Anton and I :(

I shouldn't have put that one in, it was a last minute bad decision
after spending time tracking another stupid sigill in userspace (this
time FSL CPUs not implementing some optional instructions that Fedora
compiler seems configured to generate nowadays).

> I'm f*cking tired of people having problems understanding "we're past
> rc5". If it's not something you would call stable material, you
> shouldn't send it to me.

I've taken out that commit and the rename of the PMU interrupt (which
while trivial probably wasn't important enough). Everything else is
regressions/stable material.

That does mean I rebased, but normally nobody bases on that merge branch
so it should be fine.

I'll send a new pull request.

Cheers,
Ben.

>               Linus
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

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

[Linus Torvalds]

[ Is Jeremy the patchwork maintainer? If not, can people forward this
to the real maintainer? ]

On Sun, Jun 9, 2013 at 2:33 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> This is not just bugfixes. In fact, as far as I can tell, this
> *introduces* bugs, with that "get_user()" in the exception path that
> can apparently happen with irqs disabled and will thus potentially
> result in new warnings that just make things unreadable.

Looking at that particular commit, I also notice that the commit
itself is buggered in other ways too.

It says:

    Date:   Thu Jun 6 19:42:54 2013 +0000

which surprised me due to the odd timezone, and it turns out it is
pure and utter crap.

Google finds the patch in patchwork, and "Show headers" there shows
the expected timezone

    Date: Fri, 7 Jun 2013 15:42:54 +1000

and it turns out that apparently 'patchwork' is just making up random
times, because when you download the email as an mbox, it will turn
this into that corrupt and incorrect

    Date: Thu, 06 Jun 2013 19:42:54 -0000

thing which is apparently how you got the wrong timestamp to begin with.

That odd time doesn't even make any sense that I can see, because
those two times have absolutely nothing in common afaik. Unless
timezones work differently down under. It looks like some west-coast
local time, but then it says "-0000" which is code for "I have no
f*cking clue what I'm doing".

Just to make things extra exciting, patchwork actually shows yet
*another* date string when you just look at the patch in the web
interface:

    Date June 7, 2013, 5:42 a.m.

and that actually seems to be the *correct* UTC version of that
original email date. I have no idea what that "Thu, 06 Jun 2013
19:42:54 -0000" date is, and where it came from. But it is utter
shite.

Can somebody please make sure that patchwork doesn't destroy
timezone/date information? I'm assuming this has been going on
forever, and I just noticed because I looked at that particular commit
for other reasons, and went "Is Anton in Europe now?".

             Linus

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

[Linus Torvalds]

On Sun, Jun 9, 2013 at 12:56 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> Here are a few more powerpc changes for 3.10. I've merged your
> tree in at some point (which I generally avoid) in order to get
> the compat network fixes as soon as possible.
>
> Mostly regressions, and stuff I judged could/should still go in at
> this stage.

Not pulled, because your hamster smells of eldeberries.

This is not just bugfixes. In fact, as far as I can tell, this
*introduces* bugs, with that "get_user()" in the exception path that
can apparently happen with irqs disabled and will thus potentially
result in new warnings that just make things unreadable.

I'm f*cking tired of people having problems understanding "we're past
rc5". If it's not something you would call stable material, you
shouldn't send it to me.

              Linus

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc changes for 3.10. I've merged your
tree in at some point (which I generally avoid) in order to get
the compat network fixes as soon as possible.

Mostly regressions, and stuff I judged could/should still go in at
this stage.

I'm still waiting on some more fixes to the signal handling
vs. transactional memory (this is really ugly btw) which are
hopefully coming next week.

Cheers,
Ben.

The following changes since commit 1612e111e4e565422242727efb59499cce8738e4:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-06-06 18:09:05 -0700)

are available in the git repository at:


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

for you to fetch changes up to 227331303afdca06e44dcda41d27b72015153827:

  powerpc: Print instruction when logging unhandled exceptions (2013-06-09 17:29:16 +1000)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc: Print instruction when logging unhandled exceptions

Benjamin Herrenschmidt (1):
      Merge remote-tracking branch 'origin/master' into merge

Gavin Shan (1):
      powerpc/eeh: Don't check RTAS token to get PE addr

Kevin Hao (1):
      powerpc/pci: Check the bus address instead of resource address in pcibios_fixup_resources

Michael Ellerman (3):
      powerpc: Rename PMU interrupts from CNT to PMI
      powerpc/perf: Fix deadlock caused by calling printk() in PMU exception
      powerpc: Partial revert of "Context switch more PMU related SPRs"

Michael Neuling (4):
      powerpc/power8: Fix oprofile and perf
      powerpc/pseries: Simplify denormalization handler
      powerpc/power8: Update denormalization handler
      powerpc/hw_breakpoints: Add DABRX cpu feature to fix 32-bit regression

 arch/powerpc/include/asm/cputable.h          |   17 +++--
 arch/powerpc/kernel/cputable.c               |    8 +--
 arch/powerpc/kernel/entry_64.S               |   28 --------
 arch/powerpc/kernel/exceptions-64s.S         |   90 ++++++++------------------
 arch/powerpc/kernel/irq.c                    |    2 +-
 arch/powerpc/kernel/pci-common.c             |    4 +-
 arch/powerpc/kernel/process.c                |    3 +-
 arch/powerpc/kernel/traps.c                  |   11 +++-
 arch/powerpc/perf/core-book3s.c              |    2 +-
 arch/powerpc/platforms/pseries/eeh_pseries.c |   12 ++--
 10 files changed, 60 insertions(+), 117 deletions(-)

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

[Benjamin Herrenschmidt]

On Sat, 2013-06-01 at 09:22 +1000, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> Here are a few more fixes for powerpc 3.10. It's a bit more than I would
> have liked this late in the game but I suppose that's what happens with
> a brand new chip generation coming out.
>
> A few regression fixes, some last minute fixes for new P8 features such
> as transactional memory,...
> 
> There's also one powerpc KVM patch that I requested that adds two
> missing functions to our in-kernel interrupt controller support which
> is itself a new 3.10 feature. These are defined by the base hypervisor
> specification. We didn't implement them originally because Linux doesn't
> use them but they are simple and I'm not comfortable having a
> half-implemented interface in 3.10 and having to deal with versionning
> etc... later when something starts needing those calls. They cannot be
> emulated in qemu when using in-kernel interrupt controller (not enough
> shared state).

Just added a last minute patch to fix a typo introducing a breakage
in our cputable for Power7+ processors, sorry about that, but the
regression it fixes just hurt me :-)

Sorry about that..

Cheers,
Ben.

The following changes since commit 58f8bbd2e39c3732c55698494338ee19a92c53a0:

  Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2013-05-28 10:11:34 -0700)

are available in the git repository at:


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

for you to fetch changes up to badec11b645e21acbc2411d7759e3efa559af443:

  powerpc/cputable: Fix typo on P7+ cputable entry (2013-06-01 09:30:03 +1000)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc/mm: Always invalidate tlb on hpte invalidate and update

Kevin Hao (2):
      powerpc/pci: Remove the stale comments of pci_process_bridge_OF_ranges
      powerpc/pci: Remove the unused variables in pci_process_bridge_OF_ranges

Michael Ellerman (2):
      powerpc/perf: Revert to original NO_SIPR logic
      powerpc/perf: Add missing SIER support

Michael Neuling (7):
      powerpc/tm: Make room for hypervisor in abort cause codes
      powerpc/tm: Update cause codes documentation
      powerpc/tm: Abort on emulation and alignment faults
      powerpc/tm: Move TM abort cause codes to uapi
      powerpc/tm: Fix userspace stack corruption on signal delivery for active transactions
      powerpc/pseries: Kill all prefetch streams on context switch
      powerpc/pseries: Improve stream generation comments in copypage/user

Nishanth Aravamudan (1):
      powerpc/cputable: Fix oprofile_cpu_type on power8

Paul Mackerras (1):
      powerpc/kvm/book3s: Add support for H_IPOLL and H_XIRR_X in XICS emulation

Priyanka Jain (1):
      powerpc/32bit:Store temporary result in r0 instead of r8

Srivatsa S. Bhat (1):
      powerpc/pseries: Always enable CONFIG_HOTPLUG_CPU on PSERIES SMP

Will Schmidt (1):
      powerpc/cputable: Fix typo on P7+ cputable entry

chenhui zhao (1):
      powerpc/mpic: Fix irq distribution problem when MPIC_SINGLE_DEST_CPU

 Documentation/powerpc/transactional_memory.txt |   27 +++++++++-
 arch/powerpc/include/asm/hvcall.h              |    1 +
 arch/powerpc/include/asm/ppc_asm.h             |   11 ++++
 arch/powerpc/include/asm/processor.h           |   13 ++---
 arch/powerpc/include/asm/reg.h                 |   11 ----
 arch/powerpc/include/asm/signal.h              |    3 ++
 arch/powerpc/include/asm/tm.h                  |    2 +
 arch/powerpc/include/uapi/asm/Kbuild           |    1 +
 arch/powerpc/include/uapi/asm/tm.h             |   18 +++++++
 arch/powerpc/kernel/cputable.c                 |    6 +--
 arch/powerpc/kernel/entry_32.S                 |    2 +-
 arch/powerpc/kernel/entry_64.S                 |    7 +++
 arch/powerpc/kernel/pci-common.c               |   14 +----
 arch/powerpc/kernel/signal.c                   |   40 +++++++++++++-
 arch/powerpc/kernel/signal.h                   |    2 +-
 arch/powerpc/kernel/signal_32.c                |   10 +---
 arch/powerpc/kernel/signal_64.c                |   23 +++-----
 arch/powerpc/kernel/traps.c                    |   29 ++++++++++
 arch/powerpc/kvm/book3s_hv.c                   |    2 +
 arch/powerpc/kvm/book3s_pr_papr.c              |    2 +
 arch/powerpc/kvm/book3s_xics.c                 |   29 ++++++++++
 arch/powerpc/lib/copypage_power7.S             |   19 ++++---
 arch/powerpc/lib/copyuser_power7.S             |   12 +++--
 arch/powerpc/mm/hash_native_64.c               |   30 ++++++++---
 arch/powerpc/perf/core-book3s.c                |   67 +++++++++++-------------
 arch/powerpc/platforms/pseries/Kconfig         |    2 +
 arch/powerpc/sysdev/mpic.c                     |    4 +-
 27 files changed, 262 insertions(+), 125 deletions(-)
 create mode 100644 arch/powerpc/include/uapi/asm/tm.h

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more fixes for powerpc 3.10. It's a bit more than I would
have liked this late in the game but I suppose that's what happens with
a brand new chip generation coming out.

A few regression fixes, some last minute fixes for new P8 features such
as transactional memory,...

There's also one powerpc KVM patch that I requested that adds two
missing functions to our in-kernel interrupt controller support which
is itself a new 3.10 feature. These are defined by the base hypervisor
specification. We didn't implement them originally because Linux doesn't
use them but they are simple and I'm not comfortable having a
half-implemented interface in 3.10 and having to deal with versionning
etc... later when something starts needing those calls. They cannot be
emulated in qemu when using in-kernel interrupt controller (not enough
shared state).

Cheers,
Ben.

The following changes since commit 58f8bbd2e39c3732c55698494338ee19a92c53a0:

  Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2013-05-28 10:11:34 -0700)

are available in the git repository at:


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

for you to fetch changes up to 58a032c3b106adcd2b83b7e631de3b79f238cdd2:

  powerpc/perf: Add missing SIER support (2013-06-01 08:29:29 +1000)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc/mm: Always invalidate tlb on hpte invalidate and update

Kevin Hao (2):
      powerpc/pci: Remove the stale comments of pci_process_bridge_OF_ranges
      powerpc/pci: Remove the unused variables in pci_process_bridge_OF_ranges

Michael Ellerman (2):
      powerpc/perf: Revert to original NO_SIPR logic
      powerpc/perf: Add missing SIER support

Michael Neuling (7):
      powerpc/tm: Make room for hypervisor in abort cause codes
      powerpc/tm: Update cause codes documentation
      powerpc/tm: Abort on emulation and alignment faults
      powerpc/tm: Move TM abort cause codes to uapi
      powerpc/tm: Fix userspace stack corruption on signal delivery for active transactions
      powerpc/pseries: Kill all prefetch streams on context switch
      powerpc/pseries: Improve stream generation comments in copypage/user

Nishanth Aravamudan (1):
      powerpc/cputable: Fix oprofile_cpu_type on power8

Paul Mackerras (1):
      powerpc/kvm/book3s: Add support for H_IPOLL and H_XIRR_X in XICS emulation

Priyanka Jain (1):
      powerpc/32bit:Store temporary result in r0 instead of r8

Srivatsa S. Bhat (1):
      powerpc/pseries: Always enable CONFIG_HOTPLUG_CPU on PSERIES SMP

chenhui zhao (1):
      powerpc/mpic: Fix irq distribution problem when MPIC_SINGLE_DEST_CPU

 Documentation/powerpc/transactional_memory.txt |   27 +++++++++-
 arch/powerpc/include/asm/hvcall.h              |    1 +
 arch/powerpc/include/asm/ppc_asm.h             |   11 ++++
 arch/powerpc/include/asm/processor.h           |   13 ++---
 arch/powerpc/include/asm/reg.h                 |   11 ----
 arch/powerpc/include/asm/signal.h              |    3 ++
 arch/powerpc/include/asm/tm.h                  |    2 +
 arch/powerpc/include/uapi/asm/Kbuild           |    1 +
 arch/powerpc/include/uapi/asm/tm.h             |   18 +++++++
 arch/powerpc/kernel/cputable.c                 |    4 +-
 arch/powerpc/kernel/entry_32.S                 |    2 +-
 arch/powerpc/kernel/entry_64.S                 |    7 +++
 arch/powerpc/kernel/pci-common.c               |   14 +----
 arch/powerpc/kernel/signal.c                   |   40 +++++++++++++-
 arch/powerpc/kernel/signal.h                   |    2 +-
 arch/powerpc/kernel/signal_32.c                |   10 +---
 arch/powerpc/kernel/signal_64.c                |   23 +++-----
 arch/powerpc/kernel/traps.c                    |   29 ++++++++++
 arch/powerpc/kvm/book3s_hv.c                   |    2 +
 arch/powerpc/kvm/book3s_pr_papr.c              |    2 +
 arch/powerpc/kvm/book3s_xics.c                 |   29 ++++++++++
 arch/powerpc/lib/copypage_power7.S             |   19 ++++---
 arch/powerpc/lib/copyuser_power7.S             |   12 +++--
 arch/powerpc/mm/hash_native_64.c               |   30 ++++++++---
 arch/powerpc/perf/core-book3s.c                |   67 +++++++++++-------------
 arch/powerpc/platforms/pseries/Kconfig         |    2 +
 arch/powerpc/sysdev/mpic.c                     |    4 +-
 27 files changed, 261 insertions(+), 124 deletions(-)
 create mode 100644 arch/powerpc/include/uapi/asm/tm.h

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc fixes for 3.10. Some more P8 related
bits, a bunch of fixes for our P7+/P8 HW crypto drivers, some added
workarounds for those radeons that don't do proper 64-bit MSIs and
a couple of other trivialities by myself.

Cheers,
Ben.

The following changes since commit 519fe2ecb755b875d9814cdda19778c2e88c6901:

  Merge branch 'leds-fixes-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds (2013-05-21 11:41:07 -0700)

are available in the git repository at:


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

for you to fetch changes up to f1dd153121dcb872ae6cba8d52bec97519eb7d97:

  powerpc/pseries: Make 32-bit MSI quirk work on systems lacking firmware support (2013-05-24 18:16:54 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (5):
      powerpc: Fix TLB cleanup at boot on POWER8
      powerpc/pci: Fix bogus message at boot about empty memory resources
      powerpc/powernv: Fix condition for when to invalidate the TCE cache
      powerpc: Make radeon 32-bit MSI quirk work on powernv
      powerpc/powernv: Build a zImage.epapr

Brian King (1):
      powerpc/pseries: Make 32-bit MSI quirk work on systems lacking firmware support

Kent Yoder (1):
      drivers/crypto/nx: Fixes for multiple races and issues

Michael Ellerman (1):
      powerpc: Context switch more PMU related SPRs

 arch/powerpc/include/asm/pci-bridge.h     |    2 +
 arch/powerpc/include/asm/processor.h      |    6 +++
 arch/powerpc/kernel/asm-offsets.c         |    6 +++
 arch/powerpc/kernel/cpu_setup_power.S     |    8 ++-
 arch/powerpc/kernel/entry_64.S            |   28 +++++++++++
 arch/powerpc/kernel/pci-common.c          |    7 +--
 arch/powerpc/kernel/pci_64.c              |   10 ++++
 arch/powerpc/kernel/pci_dn.c              |    8 +++
 arch/powerpc/platforms/powernv/Kconfig    |    1 +
 arch/powerpc/platforms/powernv/pci-ioda.c |   27 +++++------
 arch/powerpc/platforms/powernv/pci.c      |    6 ++-
 arch/powerpc/platforms/pseries/msi.c      |   75 +++++++++++++++--------------
 drivers/crypto/nx/nx-aes-cbc.c            |    1 +
 drivers/crypto/nx/nx-aes-ecb.c            |    1 +
 drivers/crypto/nx/nx-aes-gcm.c            |    2 +-
 drivers/crypto/nx/nx-sha256.c             |    8 +--
 drivers/crypto/nx/nx-sha512.c             |    7 +--
 drivers/crypto/nx/nx.c                    |   38 +++------------
 18 files changed, 146 insertions(+), 95 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some more powerpc fixes to apply to 3.10. This is mostly bug
fixes (some of them regressions, some of them I deemed worth merging
now) along with some patches from Li Zhong hooking up the new
context tracking stuff (for the new full NO_HZ)

Cheers,
Ben.

The following changes since commit 5737789c8340620d7b542d1d4e9b197de8eb2801:

  powerpc: Make hard_irq_disable() do the right thing vs. irq tracing (2013-05-07 17:13:57 +1000)

are available in the git repository at:

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

for you to fetch changes up to e34166ad63eac4d0fa98b4c4ed7a98202a18faef:

  powerpc: Set show_unhandled_signals to 1 by default (2013-05-14 18:01:04 +1000)

----------------------------------------------------------------
Alexander Gordeev (1):
      powerpc: Fix irq_set_affinity() return values

Alistair Popple (1):
      powerpc: Add an in memory udbg console

Aneesh Kumar K.V (2):
      powerpc/mm: Use the correct mask value when looking at pgtable address
      powerpc: Fix build errors STRICT_MM_TYPECHECKS

Anton Blanchard (1):
      powerpc/kexec: Fix kexec when using VMX optimised memcpy

Benjamin Herrenschmidt (5):
      powerpc/powernv: Properly drop characters if console is closed
      powerpc/powernv: Improve kexec reliability
      powerpc/powernv: Detect OPAL v3 API version
      powerpc/powernv: Fix starting of secondary CPUs on OPALv2 and v3
      powerpc: Set show_unhandled_signals to 1 by default

David Woodhouse (1):
      powerpc: Provide __bswapdi2

Li Zhong (6):
      powerpc: Fix MAX_STACK_TRACE_ENTRIES too low warning again
      powerpc: Syscall hooks for context tracking subsystem
      powerpc: Exception hooks for context tracking subsystem
      powerpc: Exit user context on notify resume
      powerpc: Use the new schedule_user API on userspace preemption
      powerpc: select HAVE_CONTEXT_TRACKING for pSeries

Michael Ellerman (1):
      powerpc: Make CONFIG_RTAS_PROC depend on CONFIG_PROC_FS

Michael Neuling (3):
      powerpc/perf: Move BHRB code into CONFIG_PPC64 region
      powerpc/pmu: Fix order of interpreting BHRB target entries
      powerpc/perf: Fix setting of "to" addresses for BHRB

Robert Jennings (1):
      powerpc: Bring all threads online prior to migration/hibernation

Scott Wood (2):
      powerpc: hard_irq_disable(): Call trace_hardirqs_off after disabling
      powerpc/booke64: Fix kernel hangs at kernel_dbg_exc

Vasant Hegde (1):
      powerpc/rtas_flash: Fix validate_flash buffer overflow issue

 arch/powerpc/Kconfig.debug                  |   23 +++
 arch/powerpc/include/asm/context_tracking.h |   10 +
 arch/powerpc/include/asm/firmware.h         |    4 +-
 arch/powerpc/include/asm/hw_irq.h           |    5 +-
 arch/powerpc/include/asm/opal.h             |    5 +-
 arch/powerpc/include/asm/pgalloc-64.h       |    2 +-
 arch/powerpc/include/asm/pte-hash64-64k.h   |    2 +-
 arch/powerpc/include/asm/rtas.h             |    2 +
 arch/powerpc/include/asm/thread_info.h      |    7 +-
 arch/powerpc/include/asm/udbg.h             |    1 +
 arch/powerpc/kernel/entry_32.S              |    2 -
 arch/powerpc/kernel/entry_64.S              |    5 +-
 arch/powerpc/kernel/exceptions-64e.S        |    8 +-
 arch/powerpc/kernel/machine_kexec_64.c      |    4 +
 arch/powerpc/kernel/misc_32.S               |   11 ++
 arch/powerpc/kernel/misc_64.S               |   11 ++
 arch/powerpc/kernel/pci-common.c            |    5 +-
 arch/powerpc/kernel/ppc_ksyms.c             |    3 +-
 arch/powerpc/kernel/process.c               |    8 +
 arch/powerpc/kernel/ptrace.c                |    5 +
 arch/powerpc/kernel/rtas.c                  |  113 +++++++++++
 arch/powerpc/kernel/rtas_flash.c            |   10 +-
 arch/powerpc/kernel/signal.c                |    7 +-
 arch/powerpc/kernel/traps.c                 |   80 +++++---
 arch/powerpc/kernel/udbg.c                  |    3 +
 arch/powerpc/mm/fault.c                     |   41 ++--
 arch/powerpc/mm/hash_utils_64.c             |   36 +++-
 arch/powerpc/mm/init_64.c                   |    3 +-
 arch/powerpc/perf/core-book3s.c             |  280 +++++++++++++++------------
 arch/powerpc/platforms/Kconfig              |    2 +-
 arch/powerpc/platforms/powernv/opal.c       |   30 ++-
 arch/powerpc/platforms/powernv/pci-ioda.c   |    9 +
 arch/powerpc/platforms/powernv/pci.c        |   12 ++
 arch/powerpc/platforms/powernv/pci.h        |    2 +
 arch/powerpc/platforms/powernv/powernv.h    |    2 +
 arch/powerpc/platforms/powernv/setup.c      |   16 +-
 arch/powerpc/platforms/powernv/smp.c        |   62 +++++-
 arch/powerpc/platforms/pseries/Kconfig      |    1 +
 arch/powerpc/platforms/pseries/suspend.c    |   22 +++
 arch/powerpc/platforms/wsp/ics.c            |    2 +-
 arch/powerpc/sysdev/Makefile                |    2 +
 arch/powerpc/sysdev/ehv_pic.c               |    2 +-
 arch/powerpc/sysdev/mpic.c                  |    2 +-
 arch/powerpc/sysdev/udbg_memcons.c          |  105 ++++++++++
 arch/powerpc/sysdev/xics/ics-opal.c         |    2 +-
 45 files changed, 763 insertions(+), 206 deletions(-)
 create mode 100644 arch/powerpc/include/asm/context_tracking.h
 create mode 100644 arch/powerpc/sysdev/udbg_memcons.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc bits that I would like in 3.10. Mostly
remaining bolts & screw tightening of power8 support such as actually
exposing the new features via the previously added AT_HWCAP2, and a
few fixes, some of them for problems exposed recently like irqdomain
warnings or sysfs access permission issues, some exposed by power8
hardware.

The only change outside of arch/powerpc is a small one to irqdomain.c
to allow silent failure to fix a problem on Cell where we get a dozen
WARN_ON's tripping at boot for what is basically a normal case.

Grant Acked it but I forgot to put it in and didn't want to rebase.

Cheers,
Ben.

The following changes since commit 01227a889ed56ae53aeebb9f93be9d54dd8b2de8:

  Merge tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-05-05 14:47:31 -0700)

are available in the git repository at:


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

for you to fetch changes up to 5737789c8340620d7b542d1d4e9b197de8eb2801:

  powerpc: Make hard_irq_disable() do the right thing vs. irq tracing (2013-05-07 17:13:57 +1000)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc: Emulate non privileged DSCR read and write

Benjamin Herrenschmidt (9):
      powerpc/powerpnv: Properly handle failure starting CPUs
      powerpc/pci: Don't add bogus empty resources to PHBs
      powerpc/pnv: Fix "compatible" property for P8 PHB
      irqdomain: Allow quiet failure mode
      powerpc/cell/spufs: Fix status attribute permission
      powerpc/cell/iommu: Improve error message for missing node
      powerpc/pci: Support per-aperture memory offset
      powerpc/topology: Fix spurr attribute permission
      powerpc: Make hard_irq_disable() do the right thing vs. irq tracing

Brian King (1):
      powerpc/pseries: Force 32 bit MSIs for devices that require it

Jeremy Kerr (1):
      powerpc/powernv: Defer OPAL exception handler registration

Kleber Sacilotto de Souza (1):
      powerpc/pseries: Perform proper max_bus_speed detection

Michael Neuling (1):
      powerpc/tm: Fix null pointer deference in flush_hash_page

Nishanth Aravamudan (4):
      powerpc/cputable: Reserve bits in HWCAP2 for new features
      powerpc/cputable: Advertise DSCR support on P7/P7+
      powerpc/cputable: Advertise ISEL support on appropriate embedded processors
      powerpc/cputable: Advertise support for ISEL/HTM/DSCR/TAR on POWER8

 arch/powerpc/include/asm/cputable.h         |    2 +
 arch/powerpc/include/asm/hw_irq.h           |   16 ++---
 arch/powerpc/include/asm/machdep.h          |    3 +
 arch/powerpc/include/asm/pci-bridge.h       |    8 +--
 arch/powerpc/include/asm/ppc-opcode.h       |    4 ++
 arch/powerpc/include/uapi/asm/cputable.h    |    9 +++
 arch/powerpc/kernel/cputable.c              |   14 ++++
 arch/powerpc/kernel/pci-common.c            |  101 ++++++++++-----------------
 arch/powerpc/kernel/pci_32.c                |    2 +-
 arch/powerpc/kernel/pci_64.c                |    2 +-
 arch/powerpc/kernel/sysfs.c                 |    2 +-
 arch/powerpc/kernel/traps.c                 |   10 ++-
 arch/powerpc/mm/hash_utils_64.c             |    1 +
 arch/powerpc/platforms/cell/iommu.c         |    2 +-
 arch/powerpc/platforms/cell/spu_base.c      |    2 +-
 arch/powerpc/platforms/embedded6xx/mpc10x.h |   11 ---
 arch/powerpc/platforms/powermac/pci.c       |    2 +-
 arch/powerpc/platforms/powernv/opal.c       |   15 +++-
 arch/powerpc/platforms/powernv/pci-ioda.c   |   12 ++--
 arch/powerpc/platforms/powernv/smp.c        |    4 +-
 arch/powerpc/platforms/pseries/msi.c        |   21 +++++-
 arch/powerpc/platforms/pseries/pci.c        |   53 ++++++++++++++
 arch/powerpc/platforms/pseries/pseries.h    |    4 ++
 arch/powerpc/platforms/pseries/setup.c      |    2 +
 arch/powerpc/platforms/wsp/wsp_pci.c        |    2 +-
 arch/powerpc/sysdev/fsl_pci.c               |   11 +--
 arch/powerpc/sysdev/mpic.c                  |   14 +++-
 arch/powerpc/sysdev/ppc4xx_pci.c            |   15 ++--
 kernel/irq/irqdomain.c                      |   20 +++++-
 29 files changed, 236 insertions(+), 128 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a few powerpc fixes for 3.9, mostly regressions (though not all
from 3.9 merge window) that we've been hammering into shape over the
last couple of weeks. They fix booting on Cell and G5 among other
things (yes, we've been a bit sloppy with older machines this time
around).

Cheers,
Ben.

The following changes since commit 7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b:

  Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2013-03-11 07:54:29 -0700)

are available in the git repository at:


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

for you to fetch changes up to af81d7878c641629f2693ae3fdaf74b4af14dfca:

  powerpc: Rename USER_ESID_BITS* to ESID_BITS* (2013-03-17 12:45:44 +1100)

----------------------------------------------------------------
Aneesh Kumar K.V (3):
      powerpc: Make VSID_BITS* dependency explicit
      powerpc: Update kernel VSID range
      powerpc: Rename USER_ESID_BITS* to ESID_BITS*

Anton Blanchard (1):
      powerpc: Fix -mcmodel=medium breakage in prom_init.c

Benjamin Herrenschmidt (2):
      powerpc: Fix STAB initialization
      powerpc: Fix cputable entry for 970MP rev 1.0

Michael Neuling (1):
      powerpc/ptrace: Fix brk.len used uninitialised

Paul Bolle (1):
      powerpc: Remove last traces of POWER4_ONLY

Stephen Rothwell (1):
      powerpc: Make sure that we alays include CONFIG_BINFMT_ELF

 arch/powerpc/Kconfig                   |    1 +
 arch/powerpc/include/asm/mmu-hash64.h  |  128 ++++++++++++++++----------------
 arch/powerpc/kernel/cputable.c         |    2 +-
 arch/powerpc/kernel/exceptions-64s.S   |   34 ++++++---
 arch/powerpc/kernel/prom_init.c        |   14 ++--
 arch/powerpc/kernel/ptrace.c           |    1 +
 arch/powerpc/kvm/book3s_64_mmu_host.c  |    4 +-
 arch/powerpc/mm/hash_utils_64.c        |   22 ++++--
 arch/powerpc/mm/mmu_context_hash64.c   |   11 +--
 arch/powerpc/mm/pgtable_64.c           |    2 +-
 arch/powerpc/mm/slb_low.S              |   50 ++++++-------
 arch/powerpc/mm/tlb_hash64.c           |    2 +-
 arch/powerpc/platforms/Kconfig.cputype |    6 +-
 13 files changed, 150 insertions(+), 127 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few powerpc bits & fixes for rc1. A couple of str*cpy fixes,
some fixes in handling the FSCR register on Power8 (controls the
enabling of processor features), a 32-bit build fix and a couple more
nits.

Cheers,
Ben.

The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:

  Linux 3.9-rc1 (2013-03-03 15:11:05 -0800)

are available in the git repository at:

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

for you to fetch changes up to 54c9b2253d34e8998e4bff9ac2d7a3ba0b861d52:

  powerpc: Set DSCR bit in FSCR setup (2013-03-05 16:56:30 +1100)

----------------------------------------------------------------
Akinobu Mita (1):
      powerpc: Remove unused BITOP_LE_SWIZZLE macro

Chen Gang (2):
      powerpc/pseries/hvcserver: Fix strncpy buffer limit in location code
      drivers/tty/hvc: Use strlcpy instead of strncpy

Michael Neuling (4):
      powerpc: Avoid link stack corruption in MMU on syscall entry path
      powerpc: Fix setting FSCR for HV=0 and on secondary CPUs
      powerpc: Add DSCR FSCR register bit definition
      powerpc: Set DSCR bit in FSCR setup

Tony Breeds (2):
      powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit
      powerpc: Wireup the kcmp syscall to sys_ni

 arch/powerpc/crypto/sha1-powerpc-asm.S     |    4 ++--
 arch/powerpc/include/asm/bitops.h          |    2 --
 arch/powerpc/include/asm/reg.h             |    3 ++-
 arch/powerpc/include/asm/systbl.h          |    1 +
 arch/powerpc/include/asm/unistd.h          |    2 +-
 arch/powerpc/include/uapi/asm/unistd.h     |    1 +
 arch/powerpc/kernel/cpu_setup_power.S      |    5 +++--
 arch/powerpc/kernel/exceptions-64s.S       |    4 ++--
 arch/powerpc/platforms/pseries/hvcserver.c |    5 +++--
 drivers/tty/hvc/hvcs.c                     |    9 ++-------
 10 files changed, 17 insertions(+), 19 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Just so that you don't get too bored on your Island here's a patch for
3.8 fixing a nasty bug that affects the new 64T support that was merged
in 3.7. Please apply whenever you have a chance (and an internet
connection !)

Cheers,
Ben.

The following changes since commit 689dfa894c57842a05bf6dc9f97e6bb71ec5f386:

  powerpc: Max next_tb to prevent from replaying timer interrupt (2013-01-29 10:18:16 +1100)

are available in the git repository at:

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

for you to fetch changes up to eda8eebdd153c48a4e2a3a3ac3cd9e2e31f5c6b3:

  powerpc/mm: Fix hash computation function (2013-02-04 15:15:08 +1100)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc/mm: Fix hash computation function

 arch/powerpc/mm/hash_low_64.S |   62 +++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 27 deletions(-)

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

[Geert Uytterhoeven]

On Tue, Jan 29, 2013 at 1:09 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> On Mon, 2013-01-28 at 16:03 -0800, Linus Torvalds wrote:
>> I'll have you know that I haven't quite even left for Au yet, and I
>> have LCA before diving. So no snarky "in between dives" comments,
>> please.
>
> It wasn't meant to be "snarky", sorry about that...

Sharky? Sorry, couldn't resist.

Gr{oetje,eeting}s,

                        Poor Geert without sun, dives, and sharks

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

[Benjamin Herrenschmidt]

On Mon, 2013-01-28 at 16:03 -0800, Linus Torvalds wrote:
> I'll have you know that I haven't quite even left for Au yet, and I
> have LCA before diving. So no snarky "in between dives" comments,
> please.

It wasn't meant to be "snarky", sorry about that...

> At least not for a few days.
> 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
> 
> Nothing there. Forgot to push? Or some unnamed branch/tag?

My usual problem with git request-pull when the mirror haven't caught up
yet. Branch is "merge".

> (And I _am_ leaving for the airport soon, so I may not get to it for a
> while unless you reply asap)

Have a good trip !

Cheers,
Ben.

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

[Linus Torvalds]

On Mon, Jan 28, 2013 at 3:42 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> Whenever you have a chance between two dives, you might want to consider
> pulling my merge branch to pickup a few fixes for 3.8 that have been
> accumulating for the last couple of weeks (I was myself travelling
> then on vacation).

I'll have you know that I haven't quite even left for Au yet, and I
have LCA before diving. So no snarky "in between dives" comments,
please.

At least not for a few days.

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

Nothing there. Forgot to push? Or some unnamed branch/tag?

(And I _am_ leaving for the airport soon, so I may not get to it for a
while unless you reply asap)

          Linus

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Whenever you have a chance between two dives, you might want to consider
pulling my merge branch to pickup a few fixes for 3.8 that have been
accumulating for the last couple of weeks (I was myself travelling
then on vacation). Nothing major, just a handful of powerpc bug fixes
that I consider worth getting in before 3.8 goes final.

Cheers,
Ben.

The following changes since commit 45e72af09faa7dad5d8539ebac0fe317ae88318b:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes (2013-01-28 11:53:49 -0800)

are available in the git repository at:


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

for you to fetch changes up to 689dfa894c57842a05bf6dc9f97e6bb71ec5f386:

  powerpc: Max next_tb to prevent from replaying timer interrupt (2013-01-29 10:18:16 +1100)

----------------------------------------------------------------
Carl E. Love (1):
      powerpc/oprofile: Fix error in oprofile power7_marked_instr_event() function

Cong Ding (1):
      powerpc: kernel/kgdb.c: Fix memory leakage

Li Zhong (1):
      powerpc: Fix MAX_STACK_TRACE_ENTRIES too low warning for ppc32

Steven Rostedt (1):
      powerpc/pasemi: Fix crash on reboot

Tiejun Chen (2):
      powerpc/book3e: Disable interrupt after preempt_schedule_irq
      powerpc: Max next_tb to prevent from replaying timer interrupt

 arch/powerpc/kernel/entry_32.S          |    2 ++
 arch/powerpc/kernel/entry_64.S          |   13 +++++++++++++
 arch/powerpc/kernel/kgdb.c              |    5 +++--
 arch/powerpc/kernel/time.c              |    9 +++++++--
 arch/powerpc/oprofile/op_model_power4.c |    2 +-
 arch/powerpc/platforms/pasemi/cpufreq.c |    7 +++++++
 6 files changed, 33 insertions(+), 5 deletions(-)

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

[Benjamin Herrenschmidt]

On Thu, 2013-01-03 at 17:13 +1100, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> Here are a couple of small powerpc fixes. They aren't new bugs (and
> they are both CCed to stable) but I didn't see the point of sitting
> on the fixes any longer.

Looks like I still need to fix my script to get the branch name right
for when the mirrors haven't caught up...

It's

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

Cheers,
Ben.

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a couple of small powerpc fixes. They aren't new bugs (and
they are both CCed to stable) but I didn't see the point of sitting
on the fixes any longer.

Oh and happy new year !

Cheers,
Ben.

The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:

  Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)

are available in the git repository at:

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

for you to fetch changes up to e6449c9b2d90c1bd9a5985bf05ddebfd1631cd6b:

  powerpc: Add missing NULL terminator to avoid boot panic on PPC40x (2013-01-03 16:45:52 +1100)

----------------------------------------------------------------
Gabor Juhos (1):
      powerpc: Add missing NULL terminator to avoid boot panic on PPC40x

Shan Hai (1):
      powerpc/vdso: Remove redundant locking in update_vsyscall_tz()

 arch/powerpc/kernel/time.c                 |    5 -----
 arch/powerpc/platforms/40x/ppc40x_simple.c |    3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

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

[Benjamin Herrenschmidt]

On Mon, 2012-11-26 at 09:08 +1100, Benjamin Herrenschmidt wrote:
> On Mon, 2012-11-26 at 09:07 +1100, Benjamin Herrenschmidt wrote:
> > Hi Linus !
> > 
> > Here's a patch that would be good to still have in 3.7. It's a one liner fixing
> > a regression introduced by the new EEH code in .37 (potential oops on some
> > PCI setups when configuring MSIs).

I've just added a second fix for EEH (Gavin found another issue) which
is trivial enough (and tested) so it should still go in. Updated pull
request:

The following changes since commit
d6dc24613c222f9057131ccbd5264a10bcba9f97:

  Merge remote-tracking branch 'agust/merge' into merge (2012-11-21
13:24:49 +1100)

are available in the git repository at:


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

for you to fetch changes up to e716e014384688d1a50d1aa5213ee74748c6d4e0:

  powerpc/eeh: Do not invalidate PE properly (2012-11-26 09:14:16 +1100)

----------------------------------------------------------------
Alexey Kardashevskiy (1):
      powerpc/pseries: Fix oops with MSIs when missing EEH PEs

Gavin Shan (1):
      powerpc/eeh: Do not invalidate PE properly

 arch/powerpc/platforms/pseries/eeh_pe.c |    2 +-
 arch/powerpc/platforms/pseries/msi.c    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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

[Benjamin Herrenschmidt]

On Mon, 2012-11-26 at 09:07 +1100, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> Here's a patch that would be good to still have in 3.7. It's a one liner fixing
> a regression introduced by the new EEH code in .37 (potential oops on some
> PCI setups when configuring MSIs).
> 
> Cheers,
> Ben.
> 
> The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97:
> 
>   Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git 

And the branch is "merge".

Cheers,
Ben.

> 
> for you to fetch changes up to bb4618823a3389086f157fafb2a0d97cade8d89f:
> 
>   powerpc/pseries: Fix oops with MSIs when missing EEH PEs (2012-11-23 13:26:05 +1100)
> 
> ----------------------------------------------------------------
> Alexey Kardashevskiy (1):
>       powerpc/pseries: Fix oops with MSIs when missing EEH PEs
> 
>  arch/powerpc/platforms/pseries/msi.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a patch that would be good to still have in 3.7. It's a one liner fixing
a regression introduced by the new EEH code in .37 (potential oops on some
PCI setups when configuring MSIs).

Cheers,
Ben.

The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97:

  Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100)

are available in the git repository at:


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

for you to fetch changes up to bb4618823a3389086f157fafb2a0d97cade8d89f:

  powerpc/pseries: Fix oops with MSIs when missing EEH PEs (2012-11-23 13:26:05 +1100)

----------------------------------------------------------------
Alexey Kardashevskiy (1):
      powerpc/pseries: Fix oops with MSIs when missing EEH PEs

 arch/powerpc/platforms/pseries/msi.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are small 52xx fixes that Anatolij asked me to pull a while back
and that I completely missed. The stuff is local to that platform code,
and was in next for a while, so it should still go into 3.7.

Thanks,
Ben.

The following changes since commit 8c23f406c6d86808726ace580657186bc3b44587:

  Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (2012-11-01 08:27:02 -0700)

are available in the git repository at:


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

for you to fetch changes up to d6dc24613c222f9057131ccbd5264a10bcba9f97:

  Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100)

----------------------------------------------------------------

Anatolij Gustschin (1):
      powerpc/mpc5200: move lpbfifo node and fix its interrupt property

Benjamin Herrenschmidt (1):
      Merge remote-tracking branch 'agust/merge' into merge

Eric Millbrandt (1):
      powerpc/pcm030: add pcm030-audio-fabric to dts

Wolfram Sang (1):
      powerpc: 52xx: nop out unsupported critical IRQs

 arch/powerpc/boot/dts/mpc5200b.dtsi       |    6 ++++++
 arch/powerpc/boot/dts/o2d.dtsi            |    6 ------
 arch/powerpc/boot/dts/pcm030.dts          |    7 ++++++-
 arch/powerpc/platforms/52xx/mpc52xx_pic.c |    9 +++++----
 4 files changed, 17 insertions(+), 11 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a handful of powerpc related fixes for you to pull.

Cheers,
Ben.

The following changes since commit 18673533256a2953ccefded52df2679de8640685:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2012-10-17 12:41:18 -0700)

are available in the git repository at:


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

for you to fetch changes up to 83dac59409387789b88bed40b1be86a8abc572be:

  cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries. (2012-10-18 10:57:25 +1100)

----------------------------------------------------------------
Aneesh Kumar K.V (1):
      powerpc: Build fix for powerpc KVM

Benjamin Herrenschmidt (1):
      Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"

Deepthi Dharwar (3):
      cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
      cpuidle/powerpc: Fix smt_snooze_delay functionality.
      cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.

 arch/powerpc/include/asm/kvm_book3s_32.h        |    1 +
 arch/powerpc/include/asm/processor.h            |    4 +-
 arch/powerpc/kernel/sysfs.c                     |    2 +-
 arch/powerpc/kvm/book3s_32_mmu_host.c           |    4 +-
 arch/powerpc/perf/core-book3s.c                 |    2 +-
 arch/powerpc/platforms/pseries/processor_idle.c |   62 +++++++++++------------
 6 files changed, 36 insertions(+), 39 deletions(-)

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

[Benjamin Herrenschmidt]

On Thu, 2012-10-04 at 09:02 -0700, Linus Torvalds wrote:
> Hmm. There's nothing there.
> 
> Did you mean for me to pull some branch/tag you didn't mention?

Heh, yeah, the mirrors hadn't updated yet so git request-pull didn't put
the branch name in. It's common but I usually fix it up by hand. Since I
was probably too tired for thinking straight, I forgot that and forgot
to put the proper branch name in the email subject as well... argh :-)

It's in my next branch. Mirrors should be good by now, it's at:

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

Sorry for the misshap.

Cheers,
Ben.

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

[Benjamin Herrenschmidt]

On Thu, 2012-10-04 at 09:00 -0700, Linus Torvalds wrote:
> So this happens if you have "reverse merges" (ie you've pulled my
> tree, or some other tree I've pulled), and there is no longer a single
> clear common point that you started from. In that case, there is no
> simple diff for the "what has changed since that original point", and
> to get the diff for the merge you actually have to do the merge and
> check the end result. git-request-pull doesn't do that, it just
> assumes it's the simple case of some single common point.

That was more/less my guess. Thanks.

> The fact that you haven't seen it until now just means that you've
> generally done a good job at keeping your powerpc tree "clean" from
> other trees, and containing only your own work. 

Heh, yeah I try to :-) In this specific case, this was a topic branch
from Bjorn which some pre-requisite patches to the generic PCI code that
Gavin did to allow us to get rid of some custom resource allocation
crap, so the "getting rid of" had a dependency on that topic branch.

Unfortunately, Bjorn had also based that branch on top of some larger
cleanup patch so I ended up pulling that as well from him, which tripped
the whole thing.

Cheers,
Ben.

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

[Linus Torvalds]

On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> The following changes since commit 271fd03a3013b106ccc178d54219c1be0c9759b7:
>
>   powerpc/powernv: I/O and memory alignment for P2P bridges (2012-09-11 16:59:47 -0600)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git

Hmm. There's nothing there.

Did you mean for me to pull some branch/tag you didn't mention?

              Linus

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

[Linus Torvalds]

On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> First, however, a note about the pull request details ... the diffstat looks
> completely on crack, any idea what's up ? It sees piles of files modified
> in various other archs & generic code but I see no patch in that branch
> that touches any of them.

So this happens if you have "reverse merges" (ie you've pulled my
tree, or some other tree I've pulled), and there is no longer a single
clear common point that you started from. In that case, there is no
simple diff for the "what has changed since that original point", and
to get the diff for the merge you actually have to do the merge and
check the end result. git-request-pull doesn't do that, it just
assumes it's the simple case of some single common point.

The fact that you haven't seen it until now just means that you've
generally done a good job at keeping your powerpc tree "clean" from
other trees, and containing only your own work.

               Linus

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

A couple of days late on my expectations due to chasing a nasty regression,
and here is the powerpc batch for 3.7.

First, however, a note about the pull request details ... the diffstat looks
completely on crack, any idea what's up ? It sees piles of files modified
in various other archs & generic code but I see no patch in that branch
that touches any of them.

Example:

 arch/alpha/Kconfig                                 |    2 +

But if I do:

git log linus/master..next arch/alpha/Kconfig

I get (as expected) and empty output.

It could be an artifact of me including a branch from Bjorn with some PCI
work on which I had a dependency and which you already merged earlier that
is confusing git request-pull, not sure, I don't have time to investigate that now :-)

Now some highlights in addition to the usual batch of fixes:

 - 64TB address space support for 64-bit processes by Aneesh Kumar

 - Gavin Shan did a major cleanup & re-organization of our EEH support code
(IBM fancy PCI error handling & recovery infrastructure) which paves the way
for supporting different platform backends, along with some rework of the
PCIe code for the PowerNV platform in order to remove home made resource
allocations and instead use the generic code (which is possible after some
small improvements to it done by Gavin).

 - Uprobes support by Ananth N Mavinakayanahalli 

 - A pile of embedded updates from Freescale folks, including new SoC and
board supports, more KVM stuff including preparing for 64-bit BookE KVM
support, ePAPR 1.1 updates, etc...

Cheers,
Ben.

The following changes since commit 271fd03a3013b106ccc178d54219c1be0c9759b7:

  powerpc/powernv: I/O and memory alignment for P2P bridges (2012-09-11 16:59:47 -0600)

are available in the git repository at:

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

for you to fetch changes up to d900bd7366463fd96a907b2c212242e2b68b27d8:

  powerpc/iommu: Fix multiple issues with IOMMU pools code (2012-10-04 18:03:20 +1000)

----------------------------------------------------------------
Alexey Kardashevskiy (1):
      powerpc/iommu: Add ppc_md.tce_get() callback for use by VFIO

Ananth N Mavinakayanahalli (4):
      powerpc: Consolidate {k,u}probe definitions
      powerpc: Add trap_nr to thread_struct
      powerpc: Uprobes port to powerpc
      powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t

Anatolij Gustschin (3):
      powerpc/mpc5200: add dts files for ifm camera machines
      dt/misc: add bindings documentation for ifm camera sensor interface
      powerpc/mpc52xx_lpbfifo: optionally defer fifo transfer start

Aneesh Kumar K.V (12):
      powerpc/mm: Replace open coded CONTEXT_BITS value
      powerpc/mm: Use hpt_va to compute virtual address
      powerpc/mm: Simplify hpte_decode
      powerpc/mm: Convert virtual address to vpn
      powerpc/mm: Make KERN_VIRT_SIZE not dependend on PGTABLE_RANGE
      powerpc/mm: Increase the slice range to 64TB
      powerpc/mm: Use the required number of VSID bits in slbmte
      powerpc/mm: Use 32bit array for slb cache
      powerpc/mm: Add 64TB support
      powerpc/mm: Update VSID allocation documentation
      powerpc/mm: Make some of the PGTABLE_RANGE dependency explicit
      powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get

Anton Blanchard (2):
      powerpc/pseries: Round up MSI-X requests
      powerpc/iommu: Fix multiple issues with IOMMU pools code

Benjamin Herrenschmidt (7):
      hvc_console: Better kernel console support
      hvc_vio: Improve registration of udbg backend
      Merge branch 'merge' into next
      Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next
      Merge remote-tracking branch 'kumar/next' into next
      Merge remote-tracking branch 'agust/next' into next
      Merge remote-tracking branch 'kumar/next' into next

Bharat Bhushan (1):
      powerpc: Remove unused __get_user64() and __put_user64()

Bjorn Helgaas (1):
      Merge commit 'v3.6-rc5' into pci/gavin-window-alignment

Carl E. Love (1):
      powerpc/oprofile: Fix marked events support on Power7+ not set.

Chunhe Lan (1):
      powerpc/85xx: Enable USB support in p1023rds_defconfig

Gavin Shan (36):
      powerpc/pci: Save P2P bridge resource if possible
      powerpc/eeh: Move EEH initialization around
      powerpc/eeh: Use slab to allocate eeh devices
      powerpc/eeh: More logs for EEH initialization
      powerpc/eeh: Introduce eeh_pe struct
      powerpc/eeh: Introduce global mutex
      powerpc/eeh: Create PEs for PHBs
      powerpc/eeh: Search PE based on requirement
      powerpc/eeh: Create PEs duing EEH initialization
      powerpc/eeh: Remove PE at appropriate time
      powerpc/eeh: Build EEH event based on PE
      powerpc/eeh: Trace EEH state based on PE
      powerpc/eeh: Trace error based on PE from beginning
      powerpc/eeh: Make EEH operations based on PE
      powerpc/eeh: Device bars restore based on PE
      powerpc/eeh: I/O enable and log retrival based on PE
      powerpc/eeh: Do reset based on PE
      powerpc/eeh: Make EEH handler PE sensitive
      powerpc/eeh: Handle EEH error based on PE
      powerpc/eeh: Move stats to PE
      powerpc/eeh: Probe mode support
      powerpc/eeh: Trace eeh device from I/O cache
      powerpc/eeh: Cleanup on EEH PCI address cache
      powerpc/powernv: Create bus sensitive PEs
      powerpc/powernv: PE list based on creation order
      powerpc/powernv: I/O and MMIO resource assignment for PEs
      powerpc/powernv: Initialize DMA for PEs
      powerpc/powernv: Skip check on PE if necessary
      powerpc/powernv: Fix overrunning segment tracing array
      powerpc/powernv: Using PCI core to do resource assignment
      powerpc/powernv: Remove unused functions
      powerpc/eeh: Introduce EEH_PE_INVALID type PE
      powerpc/eeh: Remove EEH PE for normal PCI hotplug
      powerpc/eeh: Global mutex to protect PE tree
      powerpc/eeh: Lock module while handling EEH event
      powerpc/eeh: Fix crash on converting OF node to edev

Jia Hongtao (4):
      powerpc/swiotlb: Enable at early stage and disable if not necessary
      powerpc: add adt7461 thermal monitor support to applicable boards
      powerpc/fsl-pci: Unify pci/pcie initialization code
      powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled

Joe MacDonald (1):
      powerpc/mm: Match variable types to API

Kim Phillips (1):
      powerpc/85xx: add Freescale P5040 SOC and SEC v5.2 device trees

Li Zhong (1):
      powerpc/trace: Fix interrupt tracepoints vs. RCU

Matthew McClintock (1):
      powerpc: Fix build dependencies for c files requiring libfdt.h

Michael Ellerman (23):
      powerpc: Remove remaining iSeries chunks
      powerpc/crypto: Remove users of virt_to_abs() and phys_to_abs() in nx crypto driver
      IB/ehca: Don't use phys_to_abs(), it's a nop
      powerpc/mm: Replace abs_to_virt() with __va()
      powerpc/pasemi: Remove uses of virt_to_abs() and abs_to_virt()
      powerpc/dart: Remove uses of virt_to_abs() and abs_to_virt()
      IB/ehca: Remove uses of virt_to_abs() and abs_to_virt()
      drivers/macintosh/smu.c: Replace abs_to_virt() with __va()
      ehea: Remove uses of virt_to_abs() and abs_to_virt()
      powerpc/kernel: Remove uses of abs_to_virt() and virt_to_abs()
      powerpc/pseries: Remove uses of abs_to_virt() and virt_to_abs()
      powerpc/mm: Remove uses of abs_to_virt() and virt_to_abs()
      powerpc/ps3: Replace virt_to_abs() with __pa()
      powerpc: Remove phys_to_abs() now all users have been removed
      powerpc: Remove abs_to_virt() now all users have been fixed
      powerpc: Remove virt_to_abs() now all users have been fixed
      powerpc: Remove all includes of <asm/abs_addr.h>
      powerpc: Remove <asm/abs_addr.h>
      powerpc: Rename 64-bit PVR constants to PVR_foo
      powerpc: Initialise paca.data_offset with poison
      powerpc: Add an xmon command to dump one or all pacas
      powerpc: Set paca->data_offset = 0 for boot cpu
      powerpc: Remove tlb batching hack for nighthawk

Michael Neuling (7):
      powerpc: Pack arch_hw_breakpoint to avoid holes in struct
      powerpc: Use consistent name info for arch_hw_breakpoint
      powerpc: Use the XDABR hcall
      powerpc: Rework set_dabr so it can take a DABRX value as well
      powerpc: Dynamically calculate the dabrx based on kernel/user/hypervisor
      powerpc: cleanup old DABRX #defines
      powerpc: Add denormalisation exception handling for POWER6/7

Mihai Caraman (6):
      powerpc/booke64: Fix machine check handler to use the right prolog
      powerpc/booke64: Use GSRR registers in Guest Doorbell interrupts
      powerpc/booke64: Add DO_KVM kernel hooks
      powerpc/booke64: Eemove mfspr srr1 duplicate in exception prolog
      powerpc/booke64: Use SPRG0/3 scratch for bolted TLB miss & crit int
      powerpc: Restore VDSO information on critical exception om BookE

Minghuan Lian (1):
      powerpc/fsl-pci: use 'Header Type' to identify PCIE mode

Nishanth Aravamudan (1):
      powerpc: Fix VMX fix for memcpy case

Olivia Yin (3):
      powerpc/e500v2: Add Power ISA properties to comply with ePAPR 1.1
      powerpc/e500mc: Add Power ISA properties to comply with ePAPR 1.1
      powerpc/e5500: Add Power ISA properties to comply with ePAPR 1.1

Paul Gortmaker (1):
      powerpc: Option FB_FSL_DIU is not really optional for mpc512x

Prabhakar Kushwaha (4):
      powerpc: Update Integrated Flash controller device tree bindings
      powerpc/mpc85xx: Add new ext fields to Integrated FLash Controller
      powerpc/mpc85xx: Update interrupt handling for IFC controller
      driver/mtd:IFC NAND:Initialise internal SRAM before any write

Richard Weinberger (1):
      powerpc: 512x: Fix mpc5121_clk_get()

Roy Zang (2):
      powerpc/pci: Add IP revision register define for Freescale PCIe controller
      powerpc/pci: Use PCIe IP block revision register instead of compatible

Scott Wood (1):
      powerpc/mm: Fix typo in PTRS_PER_PUD

Shaohui Xie (1):
      powerpc/p5040: fix dtb build warning of p5040ds.dtb

Suzuki Poulose (2):
      powerpc: Change memory_limit from phys_addr_t to unsigned long long
      powerpc: Export memory limit via device tree

Tang Yuantian (1):
      powerpc/85xx: L2sram - Add compatible string to the device id list

Tiejun Chen (3):
      powerpc/kprobe: Introduce a new thread flag
      powerpc/kprobe: Complete kprobe and migrate exception frame
      powerpc/kprobe: Don't emulate store when kprobe stwu r1

Timur Tabi (4):
      powerpc/85xx: remove P1020RDB and P2020RDB CAMP device trees
      powerpc/fsl-pci: add fsl,qoriq-pcie-v2.4 compatible string
      powerpc/85xx: Add support for P5040DS board
      powerpc/85xx: introduce support for the Freescale / iVeia P1022RDK

Varun Sethi (6):
      powerpc/mpic: finish supporting timer group B on Freescale chips
      powepc/booke: Separate out E.HV check and ivor setup code.
      powerpc/booke: Merge the 32 bit e5500/e500mc cpu setup code.
      powerpc/booke: Separate out restore_e5500/setup_e5500 routines.
      powerpc/booke: Add CPU_FTR_EMB_HV check for e5500.
      powerpc/mpic: FSL MPIC error interrupt support.

Wang Dongsheng (1):
      powerpc/8544ds: add partition table for norflash

Zhao Chenhui (5):
      powerpc/85xx: Replace epapr spin table macros/defines with a struct
      powerpc/smp: add generic_set_cpu_up() to set cpu_state as CPU_UP_PREPARE
      powerpc/85xx: implement hardware timebase sync
      powerpc/85xx: add HOTPLUG_CPU support
      powerpc/smp: Do not disable IPI interrupts during suspend

sukadev@linux.vnet.ibm.com (2):
      powerpc: Define Power7+ PV constant PV_POWER7p
      powerpc/perf: Sample only if SIAR-Valid bit is set in P7+

 Documentation/ABI/testing/sysfs-bus-pci            |   12 +
 .../ABI/testing/sysfs-platform-ideapad-laptop      |   11 +
 Documentation/DocBook/filesystems.tmpl             |    4 +-
 Documentation/DocBook/media/v4l/vidioc-g-tuner.xml |    2 +-
 Documentation/block/00-INDEX                       |   10 +-
 Documentation/block/cfq-iosched.txt                |   77 +
 Documentation/block/queue-sysfs.txt                |   64 +
 Documentation/devicetree/bindings/misc/ifm-csi.txt |   41 +
 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |    8 +-
 .../devicetree/bindings/powerpc/fsl/ifc.txt        |    9 +-
 .../devicetree/bindings/regulator/tps6586x.txt     |   12 +-
 Documentation/feature-removal-schedule.txt         |    2 +-
 Documentation/filesystems/Locking                  |    2 -
 Documentation/filesystems/porting                  |    5 +-
 Documentation/filesystems/vfat.txt                 |   11 +
 Documentation/filesystems/vfs.txt                  |    4 -
 Documentation/laptops/laptop-mode.txt              |   12 +-
 Documentation/networking/netconsole.txt            |   19 +-
 Documentation/pinctrl.txt                          |    6 +-
 Documentation/security/Yama.txt                    |   14 +-
 Documentation/sysctl/vm.txt                        |   14 +-
 Documentation/vm/hugetlbpage.txt                   |   10 +-
 Documentation/w1/slaves/w1_therm                   |    2 +
 Documentation/watchdog/src/watchdog-test.c         |    2 +-
 MAINTAINERS                                        |   70 +-
 Makefile                                           |    2 +-
 arch/alpha/Kconfig                                 |    2 +
 arch/alpha/include/asm/atomic.h                    |    4 +-
 arch/alpha/include/asm/fpu.h                       |    2 +
 arch/alpha/include/asm/ptrace.h                    |    5 +-
 arch/alpha/include/asm/socket.h                    |    2 +
 arch/alpha/include/asm/uaccess.h                   |   34 +-
 arch/alpha/include/asm/unistd.h                    |    4 +-
 arch/alpha/include/asm/word-at-a-time.h            |   55 +
 arch/alpha/kernel/alpha_ksyms.c                    |    3 -
 arch/alpha/kernel/entry.S                          |  161 --
 arch/alpha/kernel/osf_sys.c                        |   49 +
 arch/alpha/kernel/process.c                        |   19 +
 arch/alpha/kernel/systbls.S                        |    4 +-
 arch/alpha/lib/Makefile                            |    2 -
 arch/alpha/lib/ev6-strncpy_from_user.S             |  424 -----
 arch/alpha/lib/ev67-strlen_user.S                  |  107 --
 arch/alpha/lib/strlen_user.S                       |   91 --
 arch/alpha/lib/strncpy_from_user.S                 |  339 ----
 arch/alpha/mm/fault.c                              |   36 +-
 arch/alpha/oprofile/common.c                       |    1 +
 arch/arm/Kconfig                                   |    9 +-
 arch/arm/boot/dts/am33xx.dtsi                      |    5 +
 arch/arm/boot/dts/at91sam9g25ek.dts                |    2 +-
 arch/arm/boot/dts/imx23.dtsi                       |   52 +-
 arch/arm/boot/dts/imx27-3ds.dts                    |    2 +-
 arch/arm/boot/dts/imx27.dtsi                       |    6 +
 arch/arm/boot/dts/imx28.dtsi                       |   74 +-
 arch/arm/boot/dts/imx51-babbage.dts                |    6 +-
 arch/arm/boot/dts/imx51.dtsi                       |    4 +
 arch/arm/boot/dts/imx53-ard.dts                    |   22 +-
 arch/arm/boot/dts/imx53.dtsi                       |    7 +
 arch/arm/boot/dts/imx6q-sabrelite.dts              |    1 +
 arch/arm/boot/dts/imx6q.dtsi                       |    7 +
 arch/arm/boot/dts/kirkwood-iconnect.dts            |    6 +-
 arch/arm/boot/dts/twl6030.dtsi                     |    3 +
 arch/arm/configs/armadillo800eva_defconfig         |    2 +-
 arch/arm/configs/imx_v6_v7_defconfig               |    1 +
 arch/arm/configs/mxs_defconfig                     |    1 -
 arch/arm/configs/tct_hammer_defconfig              |    2 +-
 arch/arm/configs/u8500_defconfig                   |    1 +
 arch/arm/include/asm/dma-mapping.h                 |    7 +
 arch/arm/include/asm/pgtable.h                     |   40 +-
 arch/arm/include/asm/sched_clock.h                 |    2 +
 arch/arm/kernel/sched_clock.c                      |   24 +
 arch/arm/kernel/topology.c                         |    2 +-
 arch/arm/lib/Makefile                              |   23 +-
 arch/arm/lib/io-readsw-armv3.S                     |  106 ++
 arch/arm/lib/io-writesw-armv3.S                    |  126 ++
 arch/arm/lib/uaccess.S                             |  564 +++++++
 arch/arm/mach-at91/at91rm9200_time.c               |    2 +-
 arch/arm/mach-at91/at91sam9260_devices.c           |    6 +-
 arch/arm/mach-at91/at91sam9261_devices.c           |    6 +-
 arch/arm/mach-at91/at91sam9263_devices.c           |   10 +-
 arch/arm/mach-at91/at91sam9g45_devices.c           |    6 +-
 arch/arm/mach-at91/at91sam9rl_devices.c            |    6 +-
 arch/arm/mach-at91/clock.c                         |   12 +
 arch/arm/mach-davinci/board-neuros-osd2.c          |   39 -
 arch/arm/mach-dove/common.c                        |    3 +-
 arch/arm/mach-exynos/mach-origen.c                 |    7 +
 arch/arm/mach-exynos/mach-smdkv310.c               |    7 +
 arch/arm/mach-exynos/pm_domains.c                  |    2 +-
 arch/arm/mach-gemini/irq.c                         |    1 +
 arch/arm/mach-imx/Makefile                         |   10 +-
 arch/arm/mach-imx/clk-imx27.c                      |    8 +-
 arch/arm/mach-imx/clk-imx31.c                      |    2 +-
 arch/arm/mach-imx/clk-imx51-imx53.c                |    1 +
 arch/arm/mach-imx/clk-imx6q.c                      |    8 +-
 arch/arm/mach-imx/{head-v7.S => headsmp.S}         |    0
 arch/arm/mach-imx/hotplug.c                        |   23 +-
 arch/arm/mach-imx/mach-imx6q.c                     |    4 +-
 arch/arm/mach-integrator/core.c                    |    1 +
 arch/arm/mach-integrator/integrator_ap.c           |    2 +-
 arch/arm/mach-kirkwood/Makefile.boot               |    7 +-
 arch/arm/mach-kirkwood/common.c                    |   11 +-
 arch/arm/mach-kirkwood/db88f6281-bp-setup.c        |    1 +
 arch/arm/mach-mmp/sram.c                           |    2 +-
 arch/arm/mach-mv78xx0/addr-map.c                   |    2 +-
 arch/arm/mach-mv78xx0/common.c                     |    6 +-
 arch/arm/mach-mxs/Kconfig                          |    6 -
 arch/arm/mach-mxs/Makefile                         |    3 +-
 arch/arm/mach-omap2/Kconfig                        |    3 +-
 arch/arm/mach-omap2/board-igep0020.c               |    2 +
 arch/arm/mach-omap2/board-omap3evm.c               |    1 +
 arch/arm/mach-omap2/common-board-devices.c         |   11 -
 arch/arm/mach-omap2/common-board-devices.h         |    1 -
 arch/arm/mach-omap2/cpuidle44xx.c                  |    3 +-
 arch/arm/mach-omap2/mux.h                          |    1 -
 arch/arm/mach-omap2/opp4xxx_data.c                 |    2 +-
 arch/arm/mach-omap2/pm34xx.c                       |   19 +-
 arch/arm/mach-omap2/sleep44xx.S                    |    8 +-
 arch/arm/mach-omap2/twl-common.c                   |    1 +
 arch/arm/mach-orion5x/common.c                     |    3 +-
 arch/arm/mach-pxa/raumfeld.c                       |    2 +-
 arch/arm/mach-s3c24xx/Kconfig                      |    4 +-
 arch/arm/mach-s3c24xx/include/mach/dma.h           |    3 +-
 arch/arm/mach-sa1100/leds-hackkit.c                |    1 +
 arch/arm/mach-shmobile/board-armadillo800eva.c     |   13 +-
 arch/arm/mach-shmobile/board-mackerel.c            |    3 +-
 arch/arm/mach-shmobile/board-marzen.c              |    2 +-
 arch/arm/mach-shmobile/intc-sh73a0.c               |    4 +-
 arch/arm/mach-tegra/board-harmony-power.c          |   32 +-
 arch/arm/mach-ux500/Kconfig                        |    1 -
 arch/arm/mach-ux500/board-mop500-msp.c             |   10 +-
 arch/arm/mach-ux500/board-mop500.c                 |    4 +
 arch/arm/mm/dma-mapping.c                          |  126 +-
 arch/arm/mm/flush.c                                |    2 -
 arch/arm/mm/tlb-v7.S                               |    6 +-
 arch/arm/plat-omap/dmtimer.c                       |    6 +-
 arch/arm/plat-omap/include/plat/cpu.h              |    3 +-
 arch/arm/plat-omap/include/plat/multi.h            |    9 +
 arch/arm/plat-omap/include/plat/uncompress.h       |    4 +-
 arch/arm/plat-orion/common.c                       |    8 +-
 arch/arm/plat-orion/include/plat/common.h          |    6 +-
 arch/arm/plat-s3c24xx/dma.c                        |    2 +-
 arch/arm/plat-samsung/Kconfig                      |    3 +-
 arch/arm/plat-samsung/devs.c                       |   29 +-
 arch/arm/plat-samsung/include/plat/hdmi.h          |   16 +
 arch/arm/plat-samsung/pm.c                         |    2 +-
 arch/arm/vfp/vfpmodule.c                           |    2 +
 arch/blackfin/kernel/setup.c                       |    1 -
 arch/c6x/Kconfig                                   |    1 +
 arch/c6x/include/asm/cache.h                       |   16 +-
 arch/ia64/configs/generic_defconfig                |    1 -
 arch/ia64/configs/gensparse_defconfig              |    1 -
 arch/ia64/kernel/acpi.c                            |    5 +-
 arch/m68k/Kconfig                                  |   13 +-
 arch/m68k/Kconfig.cpu                              |   19 +-
 arch/m68k/apollo/config.c                          |   16 +-
 arch/m68k/include/asm/Kbuild                       |   25 +
 arch/m68k/include/asm/MC68332.h                    |  152 --
 arch/m68k/include/asm/apollodma.h                  |  248 ---
 arch/m68k/include/asm/apollohw.h                   |    2 +-
 arch/m68k/include/asm/bitsperlong.h                |    1 -
 arch/m68k/include/asm/cputime.h                    |    6 -
 arch/m68k/include/asm/delay.h                      |    2 +-
 arch/m68k/include/asm/device.h                     |    7 -
 arch/m68k/include/asm/emergency-restart.h          |    6 -
 arch/m68k/include/asm/errno.h                      |    6 -
 arch/m68k/include/asm/futex.h                      |    6 -
 arch/m68k/include/asm/ioctl.h                      |    1 -
 arch/m68k/include/asm/ipcbuf.h                     |    1 -
 arch/m68k/include/asm/irq_regs.h                   |    1 -
 arch/m68k/include/asm/kdebug.h                     |    1 -
 arch/m68k/include/asm/kmap_types.h                 |    6 -
 arch/m68k/include/asm/kvm_para.h                   |    1 -
 arch/m68k/include/asm/local.h                      |    6 -
 arch/m68k/include/asm/local64.h                    |    1 -
 arch/m68k/include/asm/mac_mouse.h                  |   23 -
 arch/m68k/include/asm/mcfmbus.h                    |   77 -
 arch/m68k/include/asm/mman.h                       |    1 -
 arch/m68k/include/asm/mutex.h                      |    9 -
 arch/m68k/include/asm/percpu.h                     |    6 -
 arch/m68k/include/asm/resource.h                   |    6 -
 arch/m68k/include/asm/sbus.h                       |   45 -
 arch/m68k/include/asm/scatterlist.h                |    6 -
 arch/m68k/include/asm/sections.h                   |    8 -
 arch/m68k/include/asm/shm.h                        |   31 -
 arch/m68k/include/asm/siginfo.h                    |    6 -
 arch/m68k/include/asm/statfs.h                     |    6 -
 arch/m68k/include/asm/topology.h                   |    6 -
 arch/m68k/include/asm/types.h                      |   22 -
 arch/m68k/include/asm/unaligned.h                  |    4 +-
 arch/m68k/include/asm/xor.h                        |    1 -
 arch/m68k/kernel/setup_no.c                        |   11 +-
 arch/m68k/kernel/sys_m68k.c                        |    8 +-
 arch/m68k/kernel/vmlinux-nommu.lds                 |    2 -
 arch/m68k/kernel/vmlinux-std.lds                   |    2 -
 arch/m68k/kernel/vmlinux-sun3.lds                  |    2 -
 arch/m68k/lib/muldi3.c                             |    2 +-
 arch/m68k/mm/init_mm.c                             |    2 +-
 arch/m68k/mm/init_no.c                             |    2 +-
 arch/m68k/platform/68328/head-de2.S                |    8 +-
 arch/m68k/platform/68328/head-pilot.S              |   10 +-
 arch/m68k/platform/68328/head-ram.S                |    4 +-
 arch/m68k/platform/68328/head-rom.S                |    6 +-
 arch/m68k/platform/68360/head-ram.S                |    6 +-
 arch/m68k/platform/68360/head-rom.S                |    8 +-
 arch/m68k/platform/coldfire/head.S                 |   10 +-
 arch/m68k/sun3/prom/init.c                         |   48 +-
 arch/microblaze/include/asm/sections.h             |    4 -
 arch/microblaze/kernel/microblaze_ksyms.c          |    3 -
 arch/microblaze/kernel/setup.c                     |    4 +-
 arch/microblaze/kernel/vmlinux.lds.S               |    1 -
 arch/mips/Kconfig                                  |    1 +
 arch/mips/alchemy/board-mtx1.c                     |    2 +
 arch/mips/ath79/dev-usb.c                          |    2 +
 arch/mips/ath79/gpio.c                             |    6 +-
 arch/mips/bcm63xx/dev-spi.c                        |    4 +
 arch/mips/cavium-octeon/octeon-irq.c               |   89 +-
 arch/mips/include/asm/mach-ath79/ar71xx_regs.h     |    3 +-
 .../include/asm/mach-ath79/cpu-feature-overrides.h |    1 -
 .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h     |    2 +
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |   13 +-
 arch/mips/include/asm/mach-cavium-octeon/irq.h     |   10 +-
 arch/mips/include/asm/module.h                     |    1 +
 arch/mips/include/asm/r4k-timer.h                  |    8 +-
 arch/mips/kernel/module.c                          |   43 +-
 arch/mips/kernel/smp.c                             |    4 +-
 arch/mips/kernel/sync-r4k.c                        |   26 +-
 arch/mips/mti-malta/malta-pci.c                    |   13 -
 arch/mips/pci/pci-ar724x.c                         |   22 +
 arch/parisc/include/asm/atomic.h                   |    4 +-
 arch/parisc/kernel/process.c                       |    2 +-
 arch/parisc/kernel/sys_parisc.c                    |    8 +-
 arch/powerpc/Kconfig                               |   17 +-
 arch/powerpc/boot/Makefile                         |    1 +
 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi    |   58 +
 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi    |   52 +
 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi     |   59 +
 arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi       |    3 +
 arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi       |    3 +
 arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi       |    3 +
 arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi       |    3 +
 arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi       |    3 +
 arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi       |    3 +
 arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi        |    7 +
 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi         |    3 +
 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi        |  320 ++++
 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi         |  114 ++
 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi      |  118 ++
 arch/powerpc/boot/dts/mpc8536ds.dtsi               |    4 +
 arch/powerpc/boot/dts/mpc8540ads.dts               |    2 +
 arch/powerpc/boot/dts/mpc8541cds.dts               |    2 +
 arch/powerpc/boot/dts/mpc8544ds.dts                |    4 +-
 arch/powerpc/boot/dts/mpc8544ds.dtsi               |   39 +
 arch/powerpc/boot/dts/mpc8555cds.dts               |    2 +
 arch/powerpc/boot/dts/mpc8560ads.dts               |    2 +
 arch/powerpc/boot/dts/o2d.dts                      |   47 +
 arch/powerpc/boot/dts/o2d.dtsi                     |  139 ++
 arch/powerpc/boot/dts/o2d300.dts                   |   52 +
 arch/powerpc/boot/dts/o2dnt2.dts                   |   48 +
 arch/powerpc/boot/dts/o2i.dts                      |   33 +
 arch/powerpc/boot/dts/o2mnt.dts                    |   33 +
 arch/powerpc/boot/dts/o3dnt.dts                    |   48 +
 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts      |   63 -
 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts      |  141 --
 arch/powerpc/boot/dts/p1022ds.dtsi                 |    4 +
 arch/powerpc/boot/dts/p1022rdk.dts                 |  188 +++
 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts      |   67 -
 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts      |  125 --
 arch/powerpc/boot/dts/p2041rdb.dts                 |    4 +
 arch/powerpc/boot/dts/p3041ds.dts                  |    4 +
 arch/powerpc/boot/dts/p4080ds.dts                  |    4 +
 arch/powerpc/boot/dts/p5020ds.dts                  |    4 +
 arch/powerpc/boot/dts/p5040ds.dts                  |  207 +++
 arch/powerpc/configs/85xx/p1023rds_defconfig       |   37 +-
 arch/powerpc/configs/corenet32_smp_defconfig       |   30 +-
 arch/powerpc/configs/corenet64_smp_defconfig       |    2 +
 arch/powerpc/configs/g5_defconfig                  |  103 +-
 arch/powerpc/configs/mpc83xx_defconfig             |   18 +-
 arch/powerpc/configs/mpc85xx_defconfig             |   34 +-
 arch/powerpc/configs/mpc85xx_smp_defconfig         |   33 +-
 arch/powerpc/configs/ppc64_defconfig               |    1 +
 arch/powerpc/configs/pseries_defconfig             |    1 +
 arch/powerpc/include/asm/abs_addr.h                |   56 -
 arch/powerpc/include/asm/cacheflush.h              |    2 +
 arch/powerpc/include/asm/cputable.h                |    2 -
 arch/powerpc/include/asm/debug.h                   |    2 +-
 arch/powerpc/include/asm/eeh.h                     |  141 +-
 arch/powerpc/include/asm/eeh_event.h               |    6 +-
 arch/powerpc/include/asm/exception-64e.h           |    6 +-
 arch/powerpc/include/asm/fsl_guts.h                |    2 +
 arch/powerpc/include/asm/fsl_ifc.h                 |   14 +-
 arch/powerpc/include/asm/hvcall.h                  |    5 -
 arch/powerpc/include/asm/hw_breakpoint.h           |    9 +-
 arch/powerpc/include/asm/kprobes.h                 |   15 +-
 arch/powerpc/include/asm/kvm_book3s.h              |    2 +-
 arch/powerpc/include/asm/kvm_book3s_asm.h          |    1 -
 arch/powerpc/include/asm/kvm_host.h                |    1 +
 arch/powerpc/include/asm/kvm_ppc.h                 |   12 +
 arch/powerpc/include/asm/machdep.h                 |    9 +-
 arch/powerpc/include/asm/mmu-hash64.h              |  169 +-
 arch/powerpc/include/asm/mmu.h                     |    9 +
 arch/powerpc/include/asm/mpc52xx.h                 |    2 +
 arch/powerpc/include/asm/mpic.h                    |   19 +
 arch/powerpc/include/asm/mpic_msgr.h               |    1 +
 arch/powerpc/include/asm/paca.h                    |    3 +-
 arch/powerpc/include/asm/page_64.h                 |   10 +-
 arch/powerpc/include/asm/pci-bridge.h              |   11 +
 arch/powerpc/include/asm/perf_event_server.h       |    1 +
 arch/powerpc/include/asm/pgtable-ppc64-4k.h        |    4 +-
 arch/powerpc/include/asm/pgtable-ppc64-64k.h       |    2 +-
 arch/powerpc/include/asm/pgtable-ppc64.h           |   19 +-
 arch/powerpc/include/asm/pgtable.h                 |   10 +-
 arch/powerpc/include/asm/ppc-opcode.h              |    3 +
 arch/powerpc/include/asm/ppc-pci.h                 |   20 +-
 arch/powerpc/include/asm/probes.h                  |   42 +
 arch/powerpc/include/asm/processor.h               |    7 +-
 arch/powerpc/include/asm/pte-hash64-64k.h          |   18 +-
 arch/powerpc/include/asm/reg.h                     |   54 +-
 arch/powerpc/include/asm/setup.h                   |    2 +-
 arch/powerpc/include/asm/smp.h                     |    2 +
 arch/powerpc/include/asm/sparsemem.h               |    4 +-
 arch/powerpc/include/asm/swiotlb.h                 |    6 +
 arch/powerpc/include/asm/thread_info.h             |    7 +-
 arch/powerpc/include/asm/tlbflush.h                |    7 +-
 arch/powerpc/include/asm/uaccess.h                 |   11 -
 arch/powerpc/include/asm/uprobes.h                 |   54 +
 arch/powerpc/kernel/Makefile                       |    1 +
 arch/powerpc/kernel/asm-offsets.c                  |    3 +-
 arch/powerpc/kernel/cpu_setup_fsl_booke.S          |   74 +-
 arch/powerpc/kernel/cputable.c                     |    4 +
 arch/powerpc/kernel/dbell.c                        |    2 +
 arch/powerpc/kernel/dma-iommu.c                    |    9 +-
 arch/powerpc/kernel/dma-swiotlb.c                  |   22 +-
 arch/powerpc/kernel/dma.c                          |    3 +-
 arch/powerpc/kernel/entry_32.S                     |   47 +-
 arch/powerpc/kernel/entry_64.S                     |   58 +-
 arch/powerpc/kernel/exceptions-64e.S               |  212 ++-
 arch/powerpc/kernel/exceptions-64s.S               |  130 +-
 arch/powerpc/kernel/fadump.c                       |    3 +-
 arch/powerpc/kernel/head_fsl_booke.S               |   46 +-
 arch/powerpc/kernel/hw_breakpoint.c                |   27 +-
 arch/powerpc/kernel/ibmebus.c                      |    1 -
 arch/powerpc/kernel/idle_power7.S                  |    2 +
 arch/powerpc/kernel/iommu.c                        |    5 +-
 arch/powerpc/kernel/irq.c                          |    8 +-
 arch/powerpc/kernel/kgdb.c                         |   27 +-
 arch/powerpc/kernel/machine_kexec.c                |   14 +-
 arch/powerpc/kernel/paca.c                         |    1 +
 arch/powerpc/kernel/pci-common.c                   |   16 +-
 arch/powerpc/kernel/process.c                      |   28 +-
 arch/powerpc/kernel/prom.c                         |    4 +-
 arch/powerpc/kernel/prom_init.c                    |    2 +-
 arch/powerpc/kernel/ptrace.c                       |    3 +
 arch/powerpc/kernel/rtas_flash.c                   |    7 +-
 arch/powerpc/kernel/rtas_pci.c                     |    5 +-
 arch/powerpc/kernel/setup_64.c                     |    2 +
 arch/powerpc/kernel/signal.c                       |    8 +-
 arch/powerpc/kernel/smp.c                          |   25 +-
 arch/powerpc/kernel/syscalls.c                     |    8 +-
 arch/powerpc/kernel/sysfs.c                        |   10 +
 arch/powerpc/kernel/time.c                         |   15 +-
 arch/powerpc/kernel/traps.c                        |    4 +-
 arch/powerpc/kernel/uprobes.c                      |  184 +++
 arch/powerpc/kernel/vdso.c                         |    4 +-
 arch/powerpc/kernel/vio.c                          |    1 -
 arch/powerpc/kvm/book3s_32_mmu_host.c              |   11 +-
 arch/powerpc/kvm/book3s_64_mmu_host.c              |   19 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S            |   14 +-
 arch/powerpc/kvm/e500_tlb.c                        |   11 +-
 arch/powerpc/kvm/trace.h                           |   14 +-
 arch/powerpc/lib/code-patching.c                   |    2 +-
 arch/powerpc/lib/copyuser_power7.S                 |   35 +-
 arch/powerpc/lib/memcpy_power7.S                   |    8 +-
 arch/powerpc/lib/sstep.c                           |   36 +-
 arch/powerpc/mm/fault.c                            |    1 +
 arch/powerpc/mm/hash_low_64.S                      |   97 +-
 arch/powerpc/mm/hash_native_64.c                   |  192 +--
 arch/powerpc/mm/hash_utils_64.c                    |   48 +-
 arch/powerpc/mm/hugetlbpage-hash64.c               |   15 +-
 arch/powerpc/mm/init_64.c                          |    1 -
 arch/powerpc/mm/mem.c                              |    6 +-
 arch/powerpc/mm/mmu_context_hash64.c               |   10 +-
 arch/powerpc/mm/numa.c                             |    7 +-
 arch/powerpc/mm/pgtable_64.c                       |   13 +-
 arch/powerpc/mm/slb_low.S                          |   62 +-
 arch/powerpc/mm/slice.c                            |  112 +-
 arch/powerpc/mm/stab.c                             |    3 +-
 arch/powerpc/mm/subpage-prot.c                     |    6 +-
 arch/powerpc/mm/tlb_hash64.c                       |   11 +-
 arch/powerpc/mm/tlb_low_64e.S                      |   18 +-
 arch/powerpc/oprofile/op_model_power4.c            |  116 +-
 arch/powerpc/perf/core-book3s.c                    |   48 +-
 arch/powerpc/perf/power7-pmu.c                     |    3 +
 arch/powerpc/platforms/44x/currituck.c             |   10 +-
 arch/powerpc/platforms/512x/Kconfig                |    1 +
 arch/powerpc/platforms/512x/clock.c                |    6 +-
 arch/powerpc/platforms/512x/mpc512x_shared.c       |    6 -
 arch/powerpc/platforms/52xx/mpc5200_simple.c       |    1 +
 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |   35 +-
 arch/powerpc/platforms/85xx/Kconfig                |   21 +
 arch/powerpc/platforms/85xx/Makefile               |    2 +
 arch/powerpc/platforms/85xx/common.c               |   10 +
 arch/powerpc/platforms/85xx/corenet_ds.c           |   38 +-
 arch/powerpc/platforms/85xx/ge_imp3a.c             |   62 +-
 arch/powerpc/platforms/85xx/mpc8536_ds.c           |   36 +-
 arch/powerpc/platforms/85xx/mpc85xx_ads.c          |   11 +-
 arch/powerpc/platforms/85xx/mpc85xx_cds.c          |   44 +-
 arch/powerpc/platforms/85xx/mpc85xx_ds.c           |   15 +-
 arch/powerpc/platforms/85xx/mpc85xx_mds.c          |   40 +-
 arch/powerpc/platforms/85xx/mpc85xx_rdb.c          |   30 +-
 arch/powerpc/platforms/85xx/p1010rdb.c             |   14 +-
 arch/powerpc/platforms/85xx/p1022_ds.c             |   36 +-
 arch/powerpc/platforms/85xx/p1022_rdk.c            |  167 ++
 arch/powerpc/platforms/85xx/p1023_rds.c            |    9 +-
 arch/powerpc/platforms/85xx/p2041_rdb.c            |    2 +-
 arch/powerpc/platforms/85xx/p3041_ds.c             |    2 +-
 arch/powerpc/platforms/85xx/p4080_ds.c             |    2 +-
 arch/powerpc/platforms/85xx/p5020_ds.c             |    2 +-
 arch/powerpc/platforms/85xx/p5040_ds.c             |   89 ++
 arch/powerpc/platforms/85xx/qemu_e500.c            |    5 +-
 arch/powerpc/platforms/85xx/sbc8548.c              |   21 +-
 arch/powerpc/platforms/85xx/smp.c                  |  220 ++-
 arch/powerpc/platforms/85xx/socrates.c             |   11 +-
 arch/powerpc/platforms/85xx/stx_gp3.c              |   13 +-
 arch/powerpc/platforms/85xx/tqm85xx.c              |   21 +-
 arch/powerpc/platforms/85xx/xes_mpc85xx.c          |   56 +-
 arch/powerpc/platforms/86xx/gef_ppc9a.c            |   12 +-
 arch/powerpc/platforms/86xx/gef_sbc310.c           |   13 +-
 arch/powerpc/platforms/86xx/gef_sbc610.c           |   12 +-
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c         |   21 +-
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c         |   42 +-
 arch/powerpc/platforms/86xx/sbc8641d.c             |   14 +-
 arch/powerpc/platforms/cell/beat.c                 |    4 +-
 arch/powerpc/platforms/cell/beat.h                 |    2 +-
 arch/powerpc/platforms/cell/beat_htab.c            |   45 +-
 arch/powerpc/platforms/pasemi/iommu.c              |    6 +-
 arch/powerpc/platforms/powernv/pci-ioda.c          |  695 +++------
 arch/powerpc/platforms/powernv/pci-p5ioc2.c        |    1 -
 arch/powerpc/platforms/powernv/pci.c               |    7 +-
 arch/powerpc/platforms/powernv/pci.h               |   21 +-
 arch/powerpc/platforms/powernv/smp.c               |   10 +-
 arch/powerpc/platforms/ps3/htab.c                  |   22 +-
 arch/powerpc/platforms/ps3/setup.c                 |   10 +-
 arch/powerpc/platforms/pseries/Makefile            |    5 +-
 arch/powerpc/platforms/pseries/eeh.c               |  543 ++-----
 arch/powerpc/platforms/pseries/eeh_cache.c         |   59 +-
 arch/powerpc/platforms/pseries/eeh_dev.c           |   14 +-
 arch/powerpc/platforms/pseries/eeh_driver.c        |  310 ++--
 arch/powerpc/platforms/pseries/eeh_event.c         |   54 +-
 arch/powerpc/platforms/pseries/eeh_pe.c            |  652 ++++++++
 arch/powerpc/platforms/pseries/eeh_pseries.c       |  247 ++-
 arch/powerpc/platforms/pseries/eeh_sysfs.c         |    9 -
 arch/powerpc/platforms/pseries/iommu.c             |   12 +-
 arch/powerpc/platforms/pseries/lpar.c              |   77 +-
 arch/powerpc/platforms/pseries/msi.c               |   26 +-
 arch/powerpc/platforms/pseries/pci.c               |    2 +-
 arch/powerpc/platforms/pseries/pci_dlpar.c         |   32 +-
 arch/powerpc/platforms/pseries/setup.c             |   22 +-
 arch/powerpc/sysdev/Makefile                       |    2 +-
 arch/powerpc/sysdev/dart_iommu.c                   |   19 +-
 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c              |   10 +
 arch/powerpc/sysdev/fsl_ifc.c                      |   20 +-
 arch/powerpc/sysdev/fsl_mpic_err.c                 |  149 ++
 arch/powerpc/sysdev/fsl_pci.c                      |  154 +-
 arch/powerpc/sysdev/fsl_pci.h                      |   20 +-
 arch/powerpc/sysdev/mpic.c                         |  102 +-
 arch/powerpc/sysdev/mpic.h                         |   22 +
 arch/powerpc/sysdev/mpic_msgr.c                    |    3 +
 arch/powerpc/sysdev/xics/icp-hv.c                  |    6 +-
 arch/powerpc/xmon/xmon.c                           |  195 ++-
 arch/s390/Kconfig                                  |    1 +
 arch/s390/include/asm/elf.h                        |    3 +-
 arch/s390/include/asm/posix_types.h                |    3 +-
 arch/s390/include/asm/smp.h                        |    1 +
 arch/s390/include/asm/sparsemem.h                  |    2 -
 arch/s390/include/asm/syscall.h                    |   10 +
 arch/s390/kernel/compat_linux.c                    |    2 -
 arch/s390/kernel/compat_wrapper.S                  |    4 +-
 arch/s390/kernel/ptrace.c                          |    7 +-
 arch/s390/kernel/sys_s390.c                        |    9 +-
 arch/sh/drivers/dma/dma-sh.c                       |    2 +-
 arch/sh/include/asm/sections.h                     |    1 -
 arch/sh/include/cpu-sh2a/cpu/sh7269.h              |   36 +-
 arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c            |  195 ++-
 arch/sh/kernel/setup.c                             |    2 +-
 arch/sh/kernel/sh_ksyms_32.c                       |    1 -
 arch/sh/kernel/vmlinux.lds.S                       |    1 -
 arch/sh/lib/mcount.S                               |    8 +-
 arch/sparc/kernel/sys_sparc_64.c                   |   10 +-
 arch/sparc/mm/init_64.c                            |   28 +-
 arch/um/os-Linux/time.c                            |    2 +-
 arch/x86/Kconfig                                   |    2 +-
 arch/x86/Makefile                                  |    4 +
 arch/x86/boot/Makefile                             |    2 +-
 arch/x86/include/asm/mce.h                         |    8 +
 arch/x86/include/asm/perf_event.h                  |   11 +-
 arch/x86/include/asm/spinlock.h                    |    3 +-
 arch/x86/kernel/acpi/sleep.c                       |    4 -
 arch/x86/kernel/acpi/sleep.h                       |    2 -
 arch/x86/kernel/acpi/wakeup_32.S                   |    4 +-
 arch/x86/kernel/acpi/wakeup_64.S                   |    4 +-
 arch/x86/kernel/alternative.c                      |    4 +-
 arch/x86/kernel/apic/io_apic.c                     |   14 +-
 arch/x86/kernel/cpu/common.c                       |    2 +
 arch/x86/kernel/cpu/mcheck/mce-severity.c          |    7 -
 arch/x86/kernel/cpu/mcheck/mce.c                   |   43 +-
 arch/x86/kernel/cpu/perf_event.c                   |   89 +-
 arch/x86/kernel/cpu/perf_event.h                   |   20 +
 arch/x86/kernel/cpu/perf_event_amd_ibs.c           |    4 +-
 arch/x86/kernel/cpu/perf_event_intel.c             |   10 +-
 arch/x86/kernel/cpu/perf_event_intel_ds.c          |    7 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore.c      |  253 +--
 arch/x86/kernel/cpu/perf_event_intel_uncore.h      |   48 +-
 arch/x86/kernel/irq.c                              |    3 +-
 arch/x86/kernel/kdebugfs.c                         |    6 +-
 arch/x86/kernel/microcode_amd.c                    |    7 +-
 arch/x86/kvm/emulate.c                             |   30 +-
 arch/x86/kvm/i8259.c                               |   17 +
 arch/x86/kvm/mmu.c                                 |   13 +-
 arch/x86/kvm/vmx.c                                 |   20 +-
 arch/x86/kvm/x86.c                                 |    9 +-
 arch/x86/mm/hugetlbpage.c                          |   21 +-
 arch/x86/mm/pageattr.c                             |   10 +-
 arch/x86/mm/srat.c                                 |   15 +-
 arch/x86/platform/efi/efi.c                        |   30 +-
 arch/x86/realmode/rm/Makefile                      |    2 +-
 arch/x86/syscalls/syscall_64.tbl                   |    8 +-
 arch/x86/xen/enlighten.c                           |  118 +-
 arch/x86/xen/mmu.c                                 |    2 +-
 arch/x86/xen/p2m.c                                 |   94 ++
 arch/x86/xen/setup.c                               |    9 +-
 arch/x86/xen/suspend.c                             |    2 +-
 arch/x86/xen/xen-ops.h                             |    2 +-
 block/blk-lib.c                                    |   41 +-
 block/blk-merge.c                                  |  117 +-
 block/genhd.c                                      |    2 +-
 drivers/acpi/ac.c                                  |    4 +
 drivers/acpi/acpica/achware.h                      |   12 +-
 drivers/acpi/acpica/hwesleep.c                     |   19 +-
 drivers/acpi/acpica/hwsleep.c                      |   20 +-
 drivers/acpi/acpica/hwxfsleep.c                    |   22 +-
 drivers/acpi/acpica/tbxface.c                      |    1 +
 drivers/acpi/battery.c                             |    2 +
 drivers/acpi/button.c                              |    4 +
 drivers/acpi/fan.c                                 |    4 +
 drivers/acpi/numa.c                                |   12 +-
 drivers/acpi/pci_root.c                            |   11 +-
 drivers/acpi/power.c                               |    4 +
 drivers/acpi/processor_driver.c                    |    2 +-
 drivers/acpi/sbs.c                                 |    2 +
 drivers/acpi/sleep.c                               |   75 +-
 drivers/acpi/sysfs.c                               |    4 +-
 drivers/acpi/thermal.c                             |    4 +
 drivers/ata/Kconfig                                |    2 +-
 drivers/ata/ahci.c                                 |    8 +
 drivers/ata/ahci.h                                 |    1 +
 drivers/ata/ata_piix.c                             |    8 +
 drivers/ata/libahci.c                              |    3 +-
 drivers/ata/libata-acpi.c                          |   15 +-
 drivers/ata/libata-core.c                          |    3 +-
 drivers/ata/pata_atiixp.c                          |   16 +
 drivers/atm/iphase.c                               |    2 +-
 drivers/base/core.c                                |    9 +-
 drivers/base/dma-contiguous.c                      |    2 +-
 drivers/base/power/clock_ops.c                     |    3 +-
 drivers/base/power/common.c                        |    4 +-
 drivers/base/power/runtime.c                       |   13 +-
 drivers/bcma/host_pci.c                            |    1 +
 drivers/bcma/sprom.c                               |    4 +-
 drivers/block/cciss_scsi.c                         |   11 +-
 drivers/block/drbd/drbd_bitmap.c                   |   15 +-
 drivers/block/drbd/drbd_int.h                      |    1 +
 drivers/block/drbd/drbd_main.c                     |   32 +-
 drivers/block/drbd/drbd_nl.c                       |    4 +-
 drivers/block/drbd/drbd_req.c                      |   36 +-
 drivers/bluetooth/ath3k.c                          |    2 +
 drivers/bluetooth/btusb.c                          |    2 +
 drivers/char/agp/intel-agp.h                       |   40 +-
 drivers/char/agp/intel-gtt.c                       |  107 +-
 drivers/char/hw_random/omap-rng.c                  |    2 +-
 drivers/char/tpm/tpm_tis.c                         |    2 +
 drivers/clocksource/cs5535-clockevt.c              |    4 +-
 drivers/cpufreq/omap-cpufreq.c                     |    4 +-
 drivers/cpufreq/pcc-cpufreq.c                      |    1 +
 drivers/cpuidle/coupled.c                          |   14 +-
 drivers/crypto/caam/jr.c                           |   10 +-
 drivers/crypto/hifn_795x.c                         |    4 +-
 drivers/crypto/nx/nx.c                             |   17 +-
 drivers/dma/imx-dma.c                              |   36 +-
 drivers/dma/tegra20-apb-dma.c                      |   18 +-
 drivers/edac/mpc85xx_edac.c                        |   43 +-
 drivers/extcon/extcon_gpio.c                       |    3 +-
 drivers/gpio/Kconfig                               |    2 +-
 drivers/gpio/gpio-em.c                             |    6 +-
 drivers/gpio/gpio-langwell.c                       |    7 +-
 drivers/gpio/gpio-msic.c                           |    2 +-
 drivers/gpio/gpio-mxc.c                            |    5 +-
 drivers/gpio/gpio-pxa.c                            |   30 +-
 drivers/gpio/gpio-rdc321x.c                        |    1 +
 drivers/gpio/gpio-samsung.c                        |   14 +-
 drivers/gpio/gpio-sch.c                            |    3 +-
 drivers/gpio/gpiolib-of.c                          |    2 +-
 drivers/gpu/drm/Kconfig                            |    1 +
 drivers/gpu/drm/drm_crtc.c                         |    2 +-
 drivers/gpu/drm/drm_edid.c                         |    3 +
 drivers/gpu/drm/drm_edid_load.c                    |    8 +-
 drivers/gpu/drm/drm_modes.c                        |    3 -
 drivers/gpu/drm/drm_proc.c                         |    4 +-
 drivers/gpu/drm/gma500/psb_intel_display.c         |    3 +
 drivers/gpu/drm/i915/i915_drv.c                    |   31 +-
 drivers/gpu/drm/i915/i915_gem.c                    |    8 +-
 drivers/gpu/drm/i915/i915_gem_context.c            |    1 -
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   20 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |   10 +-
 drivers/gpu/drm/i915/i915_reg.h                    |    1 +
 drivers/gpu/drm/i915/i915_sysfs.c                  |   12 +
 drivers/gpu/drm/i915/intel_crt.c                   |   36 +-
 drivers/gpu/drm/i915/intel_display.c               |   24 +-
 drivers/gpu/drm/i915/intel_dp.c                    |   14 +-
 drivers/gpu/drm/i915/intel_drv.h                   |   22 +-
 drivers/gpu/drm/i915/intel_i2c.c                   |   10 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |    8 +
 drivers/gpu/drm/i915/intel_modes.c                 |   31 +-
 drivers/gpu/drm/i915/intel_panel.c                 |   15 +-
 drivers/gpu/drm/i915/intel_pm.c                    |   21 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |   48 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |    6 +-
 drivers/gpu/drm/i915/intel_sprite.c                |    4 +-
 drivers/gpu/drm/mgag200/mgag200_mode.c             |   12 +-
 drivers/gpu/drm/nouveau/nouveau_acpi.c             |    6 -
 drivers/gpu/drm/nouveau/nouveau_i2c.c              |    2 +-
 drivers/gpu/drm/nouveau/nouveau_state.c            |    7 +-
 drivers/gpu/drm/nouveau/nv84_fifo.c                |    9 +
 drivers/gpu/drm/nouveau/nvc0_pm.c                  |    2 +-
 drivers/gpu/drm/nouveau/nvd0_display.c             |    2 +-
 drivers/gpu/drm/nouveau/nve0_fifo.c                |   37 +-
 drivers/gpu/drm/radeon/atombios_crtc.c             |   81 +-
 drivers/gpu/drm/radeon/atombios_dp.c               |   29 +-
 drivers/gpu/drm/radeon/atombios_encoders.c         |  140 +-
 drivers/gpu/drm/radeon/evergreen.c                 |   71 +-
 drivers/gpu/drm/radeon/evergreen_cs.c              |   13 +-
 drivers/gpu/drm/radeon/evergreend.h                |    2 +
 drivers/gpu/drm/radeon/ni.c                        |   14 +-
 drivers/gpu/drm/radeon/r600.c                      |   20 +
 drivers/gpu/drm/radeon/r600_cs.c                   |  196 ++-
 drivers/gpu/drm/radeon/r600d.h                     |   28 +
 drivers/gpu/drm/radeon/radeon.h                    |   27 +-
 drivers/gpu/drm/radeon/radeon_asic.h               |   10 +-
 drivers/gpu/drm/radeon/radeon_atombios.c           |   51 +-
 drivers/gpu/drm/radeon/radeon_atpx_handler.c       |   56 +-
 drivers/gpu/drm/radeon/radeon_bios.c               |  138 +-
 drivers/gpu/drm/radeon/radeon_combios.c            |   57 +-
 drivers/gpu/drm/radeon/radeon_cs.c                 |   32 +-
 drivers/gpu/drm/radeon/radeon_cursor.c             |    6 +-
 drivers/gpu/drm/radeon/radeon_device.c             |    6 +-
 drivers/gpu/drm/radeon/radeon_drv.c                |    7 +-
 drivers/gpu/drm/radeon/radeon_gart.c               |   26 +-
 drivers/gpu/drm/radeon/radeon_gem.c                |   13 +-
 drivers/gpu/drm/radeon/radeon_kms.c                |   35 +-
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c        |    4 +
 drivers/gpu/drm/radeon/radeon_mode.h               |    1 +
 drivers/gpu/drm/radeon/radeon_object.c             |    9 +-
 drivers/gpu/drm/radeon/radeon_ring.c               |    1 +
 drivers/gpu/drm/radeon/reg_srcs/r600               |    9 -
 drivers/gpu/drm/radeon/rv515.c                     |   13 -
 drivers/gpu/drm/radeon/si.c                        |   35 +-
 drivers/gpu/drm/radeon/sid.h                       |    3 +
 drivers/gpu/drm/udl/Kconfig                        |    1 +
 drivers/gpu/drm/udl/udl_gem.c                      |    2 +-
 drivers/gpu/drm/udl/udl_modeset.c                  |    3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |    6 +-
 drivers/gpu/vga/vga_switcheroo.c                   |   61 +-
 drivers/hid/hid-core.c                             |    8 +-
 drivers/hid/hid-logitech-dj.c                      |    4 +-
 drivers/hid/usbhid/hid-quirks.c                    |    1 +
 drivers/hwmon/asus_atk0110.c                       |    6 +
 drivers/hwmon/coretemp.c                           |    2 +-
 drivers/hwmon/w83627hf.c                           |    2 +-
 drivers/i2c/busses/i2c-diolan-u2c.c                |    1 +
 drivers/i2c/busses/i2c-nomadik.c                   |   28 +-
 drivers/i2c/busses/i2c-omap.c                      |    2 +-
 drivers/i2c/busses/i2c-tegra.c                     |    2 +-
 drivers/ide/ide-pm.c                               |    4 +-
 drivers/idle/intel_idle.c                          |    3 +-
 drivers/iio/frequency/adf4350.c                    |   24 +-
 drivers/iio/light/adjd_s311.c                      |    7 +-
 drivers/iio/light/lm3533-als.c                     |    4 +-
 drivers/infiniband/core/ucma.c                     |    2 +-
 drivers/infiniband/hw/amso1100/c2_rnic.c           |    2 +-
 drivers/infiniband/hw/cxgb3/iwch_cm.c              |    2 +-
 drivers/infiniband/hw/ehca/ehca_cq.c               |    2 +-
 drivers/infiniband/hw/ehca/ehca_eq.c               |    2 +-
 drivers/infiniband/hw/ehca/ehca_mrmw.c             |   45 +-
 drivers/infiniband/hw/ehca/ehca_qp.c               |    6 +-
 drivers/infiniband/hw/ehca/ehca_reqs.c             |    2 +-
 drivers/infiniband/hw/ehca/ehca_tools.h            |    1 -
 drivers/infiniband/hw/ehca/hcp_if.c                |   12 +-
 drivers/infiniband/hw/ehca/ipz_pt_fn.c             |    2 +-
 drivers/infiniband/hw/mlx4/mad.c                   |   16 +-
 drivers/infiniband/hw/mlx4/main.c                  |    5 +-
 drivers/infiniband/hw/mlx4/qp.c                    |    6 +-
 drivers/infiniband/hw/ocrdma/ocrdma_main.c         |   16 +-
 drivers/infiniband/hw/qib/qib_iba7322.c            |    4 +-
 drivers/infiniband/hw/qib/qib_sd7220.c             |    2 +-
 drivers/infiniband/ulp/ipoib/ipoib_cm.c            |    3 +
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |    2 +-
 drivers/infiniband/ulp/srp/ib_srp.c                |   87 +-
 drivers/infiniband/ulp/srpt/ib_srpt.c              |    2 +-
 drivers/input/keyboard/imx_keypad.c                |    3 +
 drivers/input/serio/i8042-x86ia64io.h              |   14 +
 drivers/input/tablet/wacom_wac.c                   |    6 +-
 drivers/input/touchscreen/edt-ft5x06.c             |    2 +-
 drivers/input/touchscreen/eeti_ts.c                |   21 +-
 drivers/iommu/amd_iommu.c                          |   25 +-
 drivers/iommu/amd_iommu_init.c                     |    8 +-
 drivers/iommu/exynos-iommu.c                       |    6 +-
 drivers/iommu/intel-iommu.c                        |   26 +-
 drivers/iommu/intel_irq_remapping.c                |   18 +-
 drivers/iommu/tegra-smmu.c                         |   17 +-
 drivers/isdn/isdnloop/isdnloop.c                   |   12 -
 drivers/isdn/mISDN/layer2.c                        |    2 +-
 drivers/leds/led-triggers.c                        |    2 +-
 drivers/leds/leds-lp8788.c                         |    2 +-
 drivers/leds/leds-renesas-tpu.c                    |    2 +-
 drivers/macintosh/smu.c                            |    3 +-
 drivers/md/md.c                                    |    9 +-
 drivers/md/raid10.c                                |   30 +-
 drivers/md/raid10.h                                |    2 +-
 drivers/media/dvb/siano/smsusb.c                   |    2 +-
 drivers/media/radio/radio-shark.c                  |  151 +-
 drivers/media/radio/radio-shark2.c                 |  137 +-
 drivers/media/radio/si470x/radio-si470x-common.c   |    3 +
 drivers/media/radio/si470x/radio-si470x-i2c.c      |    5 +-
 drivers/media/radio/si470x/radio-si470x-usb.c      |    2 +-
 drivers/media/rc/Kconfig                           |    1 +
 drivers/media/video/gspca/jl2005bcd.c              |    2 +-
 drivers/media/video/gspca/spca506.c                |    2 +-
 drivers/media/video/mem2mem_testdev.c              |    2 +-
 drivers/media/video/mx1_camera.c                   |    4 +-
 drivers/media/video/mx2_camera.c                   |   47 +-
 drivers/media/video/mx3_camera.c                   |   22 +-
 drivers/media/video/soc_camera.c                   |    3 +-
 drivers/media/video/soc_mediabus.c                 |    6 +
 drivers/media/video/uvc/uvc_queue.c                |    1 +
 drivers/media/video/v4l2-ioctl.c                   |   10 +-
 drivers/mfd/Kconfig                                |    3 +-
 drivers/mfd/asic3.c                                |    1 +
 drivers/mfd/ezx-pcap.c                             |    2 +-
 drivers/misc/mei/interrupt.c                       |    2 +-
 drivers/misc/mei/main.c                            |   27 +
 drivers/misc/sgi-xp/xpc_uv.c                       |   84 +-
 drivers/misc/ti-st/st_ll.c                         |    2 +-
 drivers/mmc/card/block.c                           |   26 +-
 drivers/mmc/host/atmel-mci.c                       |    6 +-
 drivers/mmc/host/bfin_sdh.c                        |    7 -
 drivers/mmc/host/dw_mmc.c                          |   85 +-
 drivers/mmc/host/mxs-mmc.c                         |   14 +-
 drivers/mmc/host/omap.c                            |   14 +-
 drivers/mmc/host/sdhci-esdhc.h                     |    6 +-
 drivers/mtd/maps/uclinux.c                         |    5 +-
 drivers/mtd/nand/Kconfig                           |    2 +-
 drivers/mtd/nand/fsl_ifc_nand.c                    |   56 +-
 drivers/mtd/nand/omap2.c                           |    7 +-
 drivers/mtd/ubi/vtbl.c                             |    4 +-
 drivers/net/appletalk/cops.c                       |    4 +-
 drivers/net/appletalk/ltpc.c                       |    4 +-
 drivers/net/bonding/bond_main.c                    |   12 +-
 drivers/net/can/sja1000/sja1000_platform.c         |    4 +-
 drivers/net/can/softing/softing_fw.c               |    7 +-
 drivers/net/cris/eth_v10.c                         |    2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |    5 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |    4 +
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |    4 +-
 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    2 -
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |   85 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |    1 +
 drivers/net/ethernet/cirrus/cs89x0.c               |   10 +-
 drivers/net/ethernet/emulex/benet/be_cmds.c        |    6 +-
 drivers/net/ethernet/emulex/benet/be_main.c        |    4 +-
 .../net/ethernet/freescale/fs_enet/mii-bitbang.c   |    4 +-
 drivers/net/ethernet/freescale/fs_enet/mii-fec.c   |    8 +-
 drivers/net/ethernet/freescale/gianfar.c           |    2 +-
 drivers/net/ethernet/ibm/ehea/ehea.h               |    1 -
 drivers/net/ethernet/ibm/ehea/ehea_phyp.c          |   12 +-
 drivers/net/ethernet/ibm/ehea/ehea_qmr.c           |   14 +-
 drivers/net/ethernet/intel/e1000e/82571.c          |   10 +-
 drivers/net/ethernet/intel/e1000e/e1000.h          |    1 +
 drivers/net/ethernet/intel/e1000e/netdev.c         |   84 +-
 drivers/net/ethernet/intel/igb/e1000_82575.c       |   16 +-
 drivers/net/ethernet/intel/igb/e1000_regs.h        |    8 +-
 drivers/net/ethernet/intel/igb/igb_ethtool.c       |   28 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |   19 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |    3 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c         |    4 +-
 drivers/net/ethernet/mellanox/mlx4/en_tx.c         |   17 +-
 drivers/net/ethernet/mellanox/mlx4/icm.c           |    9 +-
 drivers/net/ethernet/mellanox/mlx4/icm.h           |    2 +-
 drivers/net/ethernet/mellanox/mlx4/main.c          |    3 -
 drivers/net/ethernet/mellanox/mlx4/mcg.c           |    4 +-
 drivers/net/ethernet/mellanox/mlx4/mlx4.h          |    4 +-
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |    1 -
 drivers/net/ethernet/mellanox/mlx4/mr.c            |   27 +-
 drivers/net/ethernet/mellanox/mlx4/profile.c       |    4 +-
 drivers/net/ethernet/mellanox/mlx4/sense.c         |   14 -
 drivers/net/ethernet/nxp/lpc_eth.c                 |   13 -
 drivers/net/ethernet/renesas/Kconfig               |    4 +-
 drivers/net/ethernet/renesas/sh_eth.c              |   11 +-
 drivers/net/ethernet/sfc/efx.c                     |    6 +
 drivers/net/ethernet/sfc/efx.h                     |   14 +-
 drivers/net/ethernet/sfc/ethtool.c                 |   20 +-
 drivers/net/ethernet/sfc/tx.c                      |   19 +
 drivers/net/ethernet/stmicro/stmmac/common.h       |    5 +
 drivers/net/ethernet/stmicro/stmmac/descs.h        |    6 +
 drivers/net/ethernet/stmicro/stmmac/descs_com.h    |    5 +
 drivers/net/ethernet/stmicro/stmmac/dwmac100.h     |    5 +
 drivers/net/ethernet/stmicro/stmmac/dwmac1000.h    |    5 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h    |    5 +
 drivers/net/ethernet/stmicro/stmmac/mmc.h          |    5 +
 drivers/net/ethernet/stmicro/stmmac/mmc_core.c     |    6 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       |    5 +
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    2 +-
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    2 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h |    4 +
 drivers/net/ethernet/ti/davinci_cpdma.c            |    3 +-
 drivers/net/ethernet/ti/davinci_mdio.c             |    4 +-
 drivers/net/ethernet/xscale/ixp4xx_eth.c           |    1 +
 drivers/net/fddi/skfp/pmf.c                        |    2 +-
 drivers/net/hyperv/netvsc.c                        |    7 -
 drivers/net/hyperv/rndis_filter.c                  |   11 +
 drivers/net/irda/bfin_sir.c                        |    8 +-
 drivers/net/irda/ks959-sir.c                       |    1 +
 drivers/net/irda/ksdazzle-sir.c                    |    1 +
 drivers/net/macvtap.c                              |    3 +-
 drivers/net/netconsole.c                           |    6 -
 drivers/net/phy/mdio-mux-gpio.c                    |    1 -
 drivers/net/phy/mdio-mux.c                         |    2 +-
 drivers/net/ppp/pptp.c                             |    4 +-
 drivers/net/team/team.c                            |   16 +-
 drivers/net/tun.c                                  |    1 -
 drivers/net/usb/cdc-phonet.c                       |    1 +
 drivers/net/usb/cdc_ncm.c                          |   20 +
 drivers/net/usb/qmi_wwan.c                         |  255 +--
 drivers/net/usb/sierra_net.c                       |   52 +-
 drivers/net/usb/usbnet.c                           |    2 +-
 drivers/net/vmxnet3/vmxnet3_drv.c                  |    2 +-
 drivers/net/wan/dscc4.c                            |    5 +-
 drivers/net/wimax/i2400m/fw.c                      |    4 +-
 drivers/net/wireless/at76c50x-usb.c                |    2 +-
 drivers/net/wireless/ath/ath5k/base.c              |    6 +-
 drivers/net/wireless/ath/ath5k/eeprom.c            |    2 +-
 drivers/net/wireless/ath/ath5k/eeprom.h            |    1 +
 drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    5 +-
 drivers/net/wireless/ath/ath9k/hw.c                |    1 +
 drivers/net/wireless/ath/ath9k/hw.h                |    1 +
 drivers/net/wireless/ath/ath9k/mac.c               |   18 +-
 drivers/net/wireless/ath/ath9k/mac.h               |    1 +
 drivers/net/wireless/ath/ath9k/main.c              |    4 +-
 drivers/net/wireless/ath/ath9k/pci.c               |    2 +
 drivers/net/wireless/ath/ath9k/recv.c              |    2 +-
 drivers/net/wireless/b43/main.c                    |   21 +-
 drivers/net/wireless/brcm80211/brcmsmac/channel.c  |    5 +-
 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    6 +-
 drivers/net/wireless/ipw2x00/ipw2100.c             |    3 +-
 drivers/net/wireless/iwlwifi/dvm/debugfs.c         |    3 +
 drivers/net/wireless/iwlwifi/dvm/rs.c              |   13 +-
 drivers/net/wireless/iwlwifi/pcie/internal.h       |    2 +-
 drivers/net/wireless/iwlwifi/pcie/rx.c             |    2 +-
 drivers/net/wireless/iwlwifi/pcie/trans.c          |   30 +-
 drivers/net/wireless/libertas/cfg.c                |    1 +
 drivers/net/wireless/libertas/if_sdio.c            |    1 +
 drivers/net/wireless/libertas/main.c               |    5 +-
 drivers/net/wireless/p54/p54usb.c                  |    2 +-
 drivers/net/wireless/rndis_wlan.c                  |    6 +-
 drivers/net/wireless/rt2x00/rt2800lib.c            |   68 +
 drivers/net/wireless/rt2x00/rt2800pci.c            |   71 -
 drivers/net/wireless/rt2x00/rt61pci.c              |    3 +-
 drivers/net/wireless/rtl818x/rtl8187/dev.c         |    2 +-
 drivers/net/xen-netfront.c                         |   39 +-
 drivers/of/base.c                                  |   27 +
 drivers/pci/hotplug/rpadlpar_core.c                |    2 +-
 drivers/pci/pci-acpi.c                             |    4 +-
 drivers/pci/pci-driver.c                           |   13 +
 drivers/pci/pci-sysfs.c                            |   42 +
 drivers/pci/pci.c                                  |    1 +
 drivers/pci/pcie/portdrv_pci.c                     |   14 +
 drivers/pci/probe.c                                |   31 +-
 drivers/pinctrl/core.c                             |   13 +-
 drivers/pinctrl/pinctrl-imx23.c                    |    2 +-
 drivers/pinctrl/pinctrl-imx28.c                    |    2 +-
 drivers/pinctrl/pinctrl-imx51.c                    |    2 +-
 drivers/pinctrl/pinctrl-nomadik-db8500.c           |    7 +-
 drivers/pinctrl/pinctrl-nomadik.c                  |    3 +-
 drivers/pinctrl/pinctrl-sirf.c                     |    1 -
 drivers/pinctrl/pinctrl-u300.c                     |    8 +-
 drivers/platform/x86/Kconfig                       |    6 +-
 drivers/platform/x86/apple-gmux.c                  |  426 ++++-
 drivers/platform/x86/asus-wmi.c                    |   21 +-
 drivers/platform/x86/asus-wmi.h                    |    1 +
 drivers/platform/x86/classmate-laptop.c            |   16 +-
 drivers/platform/x86/dell-laptop.c                 |   12 +-
 drivers/platform/x86/fujitsu-tablet.c              |    2 +
 drivers/platform/x86/hdaps.c                       |    2 +
 drivers/platform/x86/hp_accel.c                    |    2 +-
 drivers/platform/x86/ideapad-laptop.c              |  110 +-
 drivers/platform/x86/msi-laptop.c                  |    4 +
 drivers/platform/x86/panasonic-laptop.c            |    4 +
 drivers/platform/x86/sony-laptop.c                 |   12 +-
 drivers/platform/x86/thinkpad_acpi.c               |    9 +
 drivers/platform/x86/toshiba_acpi.c                |    2 +
 drivers/platform/x86/toshiba_bluetooth.c           |    4 +
 drivers/platform/x86/xo15-ebook.c                  |    2 +
 drivers/pwm/Kconfig                                |   31 +-
 drivers/pwm/core.c                                 |   12 +-
 drivers/pwm/pwm-samsung.c                          |    1 +
 drivers/pwm/pwm-tegra.c                            |    4 +-
 drivers/pwm/pwm-tiecap.c                           |    4 +-
 drivers/pwm/pwm-tiehrpwm.c                         |    4 +-
 drivers/pwm/pwm-vt8500.c                           |    2 +-
 drivers/rapidio/devices/tsi721.c                   |   11 +-
 drivers/regulator/ab3100.c                         |    1 +
 drivers/regulator/anatop-regulator.c               |    5 +-
 drivers/regulator/core.c                           |    2 +-
 drivers/regulator/gpio-regulator.c                 |   38 +-
 drivers/regulator/palmas-regulator.c               |   23 +-
 drivers/regulator/tps6586x-regulator.c             |    8 +-
 drivers/regulator/twl-regulator.c                  |    5 +-
 drivers/rtc/interface.c                            |    2 +
 drivers/rtc/rtc-at91sam9.c                         |   22 +-
 drivers/rtc/rtc-cmos.c                             |    1 -
 drivers/rtc/rtc-pcf2123.c                          |    2 +
 drivers/rtc/rtc-rs5c348.c                          |    7 +-
 drivers/s390/block/dasd_eckd.c                     |    2 +-
 drivers/s390/block/dasd_ioctl.c                    |    7 +-
 drivers/s390/char/sclp_sdias.c                     |    2 +
 drivers/scsi/ipr.c                                 |   18 +-
 drivers/sh/intc/core.c                             |   27 +-
 drivers/spi/spi-bcm63xx.c                          |   35 +-
 drivers/spi/spi-coldfire-qspi.c                    |    5 +-
 drivers/spi/spi-omap2-mcspi.c                      |    6 +-
 drivers/spi/spi-pl022.c                            |    1 -
 drivers/spi/spi-s3c64xx.c                          |   14 +-
 drivers/staging/comedi/drivers.c                   |    2 +-
 drivers/staging/comedi/drivers/adv_pci1710.c       |    3 -
 drivers/staging/comedi/drivers/adv_pci1723.c       |    2 -
 drivers/staging/comedi/drivers/adv_pci_dio.c       |    2 -
 drivers/staging/comedi/drivers/daqboard2000.c      |   17 +-
 drivers/staging/comedi/drivers/dt3000.c            |    6 +-
 drivers/staging/comedi/drivers/rtd520.c            |   26 +-
 drivers/staging/comedi/drivers/usbdux.c            |    4 +-
 drivers/staging/comedi/drivers/usbduxfast.c        |    4 +-
 drivers/staging/comedi/drivers/usbduxsigma.c       |    4 +-
 drivers/staging/csr/Kconfig                        |    2 +-
 drivers/staging/iio/adc/ad7192.c                   |   48 +-
 drivers/staging/iio/adc/ad7298_ring.c              |    2 +-
 drivers/staging/iio/adc/ad7780.c                   |   10 +-
 drivers/staging/iio/adc/ad7793.c                   |   99 +-
 drivers/staging/vt6656/main_usb.c                  |    2 +-
 drivers/staging/winbond/wbusb.c                    |    2 +-
 drivers/target/target_core_pscsi.c                 |    9 +-
 drivers/target/target_core_transport.c             |   15 +-
 drivers/target/tcm_fc/tcm_fc.h                     |    1 +
 drivers/target/tcm_fc/tfc_cmd.c                    |    8 +-
 drivers/target/tcm_fc/tfc_sess.c                   |    4 +-
 drivers/tty/hvc/hvc_console.c                      |   33 +-
 drivers/tty/hvc/hvc_vio.c                          |  123 +-
 drivers/tty/serial/Kconfig                         |   10 +-
 drivers/tty/serial/ifx6x60.c                       |    2 +-
 drivers/tty/serial/mxs-auart.c                     |   14 +-
 drivers/tty/serial/pmac_zilog.c                    |   12 +-
 drivers/usb/Kconfig                                |    2 +-
 drivers/usb/chipidea/Kconfig                       |    9 +-
 drivers/usb/class/cdc-acm.c                        |    3 +-
 drivers/usb/early/ehci-dbgp.c                      |    2 +-
 drivers/usb/gadget/u_ether.c                       |    6 +
 drivers/usb/host/ehci-omap.c                       |  167 +-
 drivers/usb/host/ehci-sead3.c                      |    2 +-
 drivers/usb/host/ehci-tegra.c                      |    3 +-
 drivers/usb/host/isp1362-hcd.c                     |    8 +-
 drivers/usb/host/ohci-omap.c                       |    2 -
 drivers/usb/host/pci-quirks.c                      |    7 +
 drivers/usb/host/pci-quirks.h                      |    1 +
 drivers/usb/host/xhci-pci.c                        |   10 +
 drivers/usb/host/xhci-ring.c                       |   40 +-
 drivers/usb/host/xhci.c                            |    8 +-
 drivers/usb/host/xhci.h                            |    3 +
 drivers/usb/misc/emi62.c                           |    2 +-
 drivers/usb/musb/Kconfig                           |    4 +-
 drivers/usb/musb/musb_dsps.c                       |   19 +-
 drivers/usb/renesas_usbhs/common.c                 |    6 +-
 drivers/usb/renesas_usbhs/mod_host.c               |    8 +
 drivers/usb/serial/bus.c                           |   15 +-
 drivers/usb/serial/ftdi_sio.c                      |    1 +
 drivers/usb/serial/ftdi_sio_ids.h                  |    7 +
 drivers/usb/serial/ipw.c                           |    3 +-
 drivers/usb/serial/mos7840.c                       |   16 +-
 drivers/usb/serial/option.c                        |  285 ++--
 drivers/usb/serial/qcserial.c                      |   47 +-
 drivers/usb/serial/usb-wwan.h                      |    3 +-
 drivers/usb/serial/usb_wwan.c                      |   68 +-
 drivers/vfio/vfio.c                                |   19 +-
 drivers/vhost/Kconfig                              |    3 +
 drivers/vhost/Kconfig.tcm                          |    6 +
 drivers/vhost/Makefile                             |    2 +
 drivers/vhost/tcm_vhost.c                          | 1649 ++++++++++++++++++++
 drivers/vhost/tcm_vhost.h                          |  103 ++
 drivers/video/auo_k190x.c                          |    2 -
 drivers/video/console/bitblit.c                    |    2 +-
 drivers/video/console/fbcon.c                      |   11 +-
 drivers/video/mb862xx/mb862xxfbdrv.c               |    2 +
 drivers/video/omap2/dss/sdi.c                      |   14 +
 drivers/video/omap2/omapfb/omapfb-main.c           |    2 +-
 drivers/video/ps3fb.c                              |    3 +-
 drivers/w1/slaves/w1_therm.c                       |    9 +
 drivers/w1/w1_family.h                             |    1 +
 drivers/watchdog/booke_wdt.c                       |    7 +-
 drivers/watchdog/da9052_wdt.c                      |    1 -
 drivers/xen/platform-pci.c                         |   15 -
 drivers/xen/swiotlb-xen.c                          |    2 +-
 drivers/xen/xen-pciback/pci_stub.c                 |    8 +-
 drivers/zorro/zorro.c                              |    2 -
 fs/autofs4/expire.c                                |   36 +-
 fs/bio.c                                           |   13 +-
 fs/block_dev.c                                     |    3 +
 fs/btrfs/backref.c                                 |    4 +-
 fs/btrfs/compression.c                             |    1 +
 fs/btrfs/ctree.c                                   |    9 +-
 fs/btrfs/ctree.h                                   |    3 +-
 fs/btrfs/delayed-inode.c                           |   12 +-
 fs/btrfs/delayed-ref.c                             |  163 +-
 fs/btrfs/delayed-ref.h                             |    4 +
 fs/btrfs/disk-io.c                                 |   53 +-
 fs/btrfs/disk-io.h                                 |    2 +-
 fs/btrfs/extent-tree.c                             |  123 +-
 fs/btrfs/extent_io.c                               |   17 +-
 fs/btrfs/file-item.c                               |    4 +-
 fs/btrfs/inode.c                                   |  329 ++--
 fs/btrfs/ioctl.c                                   |    7 +-
 fs/btrfs/locking.c                                 |    2 +-
 fs/btrfs/ordered-data.c                            |    2 +-
 fs/btrfs/qgroup.c                                  |   12 +-
 fs/btrfs/root-tree.c                               |    4 +-
 fs/btrfs/super.c                                   |   19 +-
 fs/btrfs/transaction.c                             |    3 +-
 fs/btrfs/volumes.c                                 |   37 +-
 fs/btrfs/volumes.h                                 |    2 -
 fs/buffer.c                                        |   66 +-
 fs/ceph/debugfs.c                                  |    1 +
 fs/ceph/inode.c                                    |   15 +-
 fs/ceph/ioctl.c                                    |    3 +-
 fs/cifs/cifssmb.c                                  |   11 +-
 fs/cifs/dir.c                                      |    9 +-
 fs/cifs/inode.c                                    |   24 +-
 fs/cifs/link.c                                     |    2 +
 fs/cifs/smb2misc.c                                 |   16 +-
 fs/cifs/smb2pdu.h                                  |   10 +-
 fs/cifs/transport.c                                |    9 +-
 fs/compat.c                                        |   10 +-
 fs/direct-io.c                                     |    5 +
 fs/eventpoll.c                                     |    2 +-
 fs/exofs/inode.c                                   |   27 +-
 fs/exofs/ore.c                                     |   14 +-
 fs/exofs/super.c                                   |   11 -
 fs/ext3/inode.c                                    |    8 -
 fs/ext3/super.c                                    |   11 -
 fs/ext4/balloc.c                                   |   62 +-
 fs/ext4/bitmap.c                                   |    1 -
 fs/ext4/extents.c                                  |    1 +
 fs/ext4/inode.c                                    |   10 +-
 fs/ext4/super.c                                    |   17 +-
 fs/fuse/dir.c                                      |    3 +
 fs/fuse/file.c                                     |   15 +-
 fs/fuse/fuse_i.h                                   |    3 +
 fs/fuse/inode.c                                    |   32 +-
 fs/gfs2/meta_io.c                                  |    2 +-
 fs/hfs/mdb.c                                       |    4 +-
 fs/jbd/journal.c                                   |    9 +-
 fs/jbd2/journal.c                                  |    7 +-
 fs/logfs/dev_bdev.c                                |   15 +-
 fs/logfs/inode.c                                   |   18 +-
 fs/logfs/journal.c                                 |    2 +-
 fs/logfs/readwrite.c                               |    1 -
 fs/logfs/segment.c                                 |    2 +-
 fs/namei.c                                         |   10 +-
 fs/nfs/Makefile                                    |   18 +-
 fs/nfs/client.c                                    |    2 +-
 fs/nfs/idmap.c                                     |   62 +-
 fs/nfs/nfs3proc.c                                  |    2 +-
 fs/nfs/nfs4_fs.h                                   |    3 +
 fs/nfs/nfs4client.c                                |    2 +-
 fs/nfs/nfs4proc.c                                  |   76 +-
 fs/nfs/nfs4super.c                                 |   15 -
 fs/nfs/nfs4xdr.c                                   |   26 +-
 fs/nfs/objlayout/objio_osd.c                       |   55 +-
 fs/nfs/pagelist.c                                  |    2 +
 fs/nfs/pnfs.c                                      |   39 +-
 fs/nfs/pnfs.h                                      |    2 +-
 fs/nfs/super.c                                     |   39 +-
 fs/nfs/write.c                                     |   15 +-
 fs/nfsd/nfs4callback.c                             |    4 +-
 fs/nfsd/state.h                                    |    1 -
 fs/nilfs2/super.c                                  |    4 -
 fs/nilfs2/the_nilfs.h                              |    2 -
 fs/open.c                                          |    9 +-
 fs/quota/dquot.c                                   |    2 +-
 fs/reiserfs/bitmap.c                               |    2 -
 fs/reiserfs/inode.c                                |    2 +-
 fs/super.c                                         |   40 -
 fs/ubifs/debug.h                                   |    2 +-
 fs/ubifs/file.c                                    |   10 +-
 fs/ubifs/lpt.c                                     |    5 +-
 fs/ubifs/recovery.c                                |    2 +-
 fs/ubifs/replay.c                                  |    3 +-
 fs/ubifs/super.c                                   |    5 +-
 fs/udf/inode.c                                     |    5 +-
 fs/udf/super.c                                     |    7 +-
 fs/xfs/xfs_discard.c                               |    6 +-
 fs/xfs/xfs_ialloc.c                                |   17 +-
 fs/xfs/xfs_rtalloc.c                               |    2 +-
 include/acpi/acpixf.h                              |    4 +-
 include/acpi/actypes.h                             |    2 +-
 include/asm-generic/mutex-xchg.h                   |   11 +-
 include/drm/drm_crtc.h                             |    5 +-
 include/drm/drm_mode.h                             |    5 +-
 include/drm/drm_pciids.h                           |    3 +
 include/drm/radeon_drm.h                           |    2 +
 include/linux/Kbuild                               |    1 +
 include/linux/acpi.h                               |    2 +-
 include/linux/backing-dev.h                        |    1 -
 include/linux/bcma/bcma_driver_chipcommon.h        |    6 +
 include/linux/blkdev.h                             |   14 +-
 include/linux/can.h                                |   25 +-
 include/linux/compaction.h                         |    4 +-
 include/linux/cpuidle.h                            |    4 +
 include/linux/efi.h                                |    2 +
 include/linux/fs.h                                 |    3 -
 include/linux/ftrace_event.h                       |    5 +-
 include/linux/fuse.h                               |   19 +-
 include/linux/hardirq.h                            |    2 +-
 include/linux/if_team.h                            |   30 +-
 include/linux/iio/frequency/adf4350.h              |    2 +
 include/linux/input/eeti_ts.h                      |    1 +
 include/linux/iommu.h                              |    2 +
 include/linux/ipv6.h                               |    1 +
 include/linux/irq.h                                |    1 +
 include/linux/jbd2.h                               |    1 +
 include/linux/jiffies.h                            |   29 +-
 include/linux/kdb.h                                |    2 -
 include/linux/kernel.h                             |   12 +-
 include/linux/kref.h                               |   18 +
 include/linux/ktime.h                              |    7 -
 include/linux/mfd/ezx-pcap.h                       |    1 +
 include/linux/mmc/card.h                           |    1 +
 include/linux/mv643xx_eth.h                        |    2 +
 include/linux/netdevice.h                          |    7 +-
 include/linux/netfilter/nf_conntrack_sip.h         |    2 +-
 include/linux/netpoll.h                            |   42 +-
 include/linux/nfs_page.h                           |    1 +
 include/linux/nfs_xdr.h                            |    1 +
 include/linux/of.h                                 |    7 +
 include/linux/pci_ids.h                            |    2 +-
 include/linux/perf_event.h                         |    3 +-
 include/linux/pinctrl/consumer.h                   |    1 +
 include/linux/sched.h                              |    8 -
 include/linux/security.h                           |    2 -
 include/linux/string.h                             |    2 +-
 include/linux/time.h                               |   29 +-
 include/linux/timex.h                              |    2 +-
 include/linux/topology.h                           |    1 +
 include/linux/writeback.h                          |    1 -
 include/net/cfg80211.h                             |    2 +
 include/net/codel.h                                |    8 +-
 include/net/dst.h                                  |    2 +-
 include/net/inet_connection_sock.h                 |    1 +
 include/net/inet_sock.h                            |    9 -
 include/net/ip.h                                   |    2 +-
 include/net/llc.h                                  |    2 +-
 include/net/netfilter/nf_conntrack_ecache.h        |    1 +
 include/net/scm.h                                  |    4 +-
 include/net/sock.h                                 |    2 +
 include/net/tcp.h                                  |    1 +
 include/net/xfrm.h                                 |    6 +
 include/sound/pcm.h                                |    3 +-
 include/target/target_core_base.h                  |    2 -
 include/trace/events/sched.h                       |    4 +
 include/trace/ftrace.h                             |    6 +-
 include/xen/events.h                               |    2 -
 init/main.c                                        |    8 +-
 ipc/mqueue.c                                       |   61 +-
 kernel/audit_tree.c                                |   19 +-
 kernel/debug/kdb/kdb_debugger.c                    |    4 +
 kernel/debug/kdb/kdb_io.c                          |   11 -
 kernel/debug/kdb/kdb_main.c                        |   15 +-
 kernel/events/callchain.c                          |    9 +-
 kernel/events/core.c                               |   30 +-
 kernel/events/internal.h                           |    3 +-
 kernel/fork.c                                      |    4 +-
 kernel/futex.c                                     |   17 +-
 kernel/irq/manage.c                                |   15 +-
 kernel/power/suspend.c                             |    3 -
 kernel/printk.c                                    |    2 +
 kernel/sched/core.c                                |   39 +-
 kernel/sched/cpupri.c                              |   10 +-
 kernel/sched/fair.c                                |   40 +-
 kernel/sched/rt.c                                  |   13 +
 kernel/sched/sched.h                               |    8 +-
 kernel/sched/stop_task.c                           |   22 +-
 kernel/task_work.c                                 |    1 +
 kernel/time/jiffies.c                              |    2 +-
 kernel/time/ntp.c                                  |    2 +-
 kernel/time/timekeeping.c                          |  442 +++---
 kernel/timer.c                                     |    9 -
 kernel/trace/trace_event_perf.c                    |    2 +-
 kernel/trace/trace_kprobe.c                        |    6 +-
 kernel/trace/trace_syscalls.c                      |    8 +-
 kernel/trace/trace_uprobe.c                        |    2 +-
 kernel/watchdog.c                                  |   21 +-
 mm/backing-dev.c                                   |   52 -
 mm/compaction.c                                    |  156 +-
 mm/filemap.c                                       |    7 -
 mm/internal.h                                      |    1 +
 mm/mempolicy.c                                     |    2 +-
 mm/mmap.c                                          |    7 +-
 mm/page-writeback.c                                |    1 -
 mm/page_alloc.c                                    |   38 +-
 mm/slab.c                                          |    1 +
 net/8021q/vlan_dev.c                               |   52 +-
 net/atm/common.c                                   |    1 +
 net/atm/pvc.c                                      |    1 +
 net/batman-adv/gateway_client.c                    |    6 +-
 net/batman-adv/translation-table.c                 |    1 +
 net/bluetooth/hci_event.c                          |   28 +-
 net/bluetooth/hci_sock.c                           |    2 +
 net/bluetooth/l2cap_core.c                         |    1 +
 net/bluetooth/l2cap_sock.c                         |    3 +-
 net/bluetooth/rfcomm/sock.c                        |    2 +
 net/bluetooth/rfcomm/tty.c                         |    2 +-
 net/bluetooth/sco.c                                |   19 +-
 net/bluetooth/smp.c                                |    5 +-
 net/bridge/br_device.c                             |   30 +-
 net/bridge/br_forward.c                            |    2 +-
 net/bridge/br_if.c                                 |    6 +-
 net/bridge/br_private.h                            |    4 +-
 net/caif/chnl_net.c                                |    4 +
 net/ceph/ceph_common.c                             |    1 -
 net/ceph/debugfs.c                                 |    4 +
 net/ceph/messenger.c                               |   11 +-
 net/ceph/mon_client.c                              |   51 +-
 net/core/dev.c                                     |   28 +-
 net/core/dst.c                                     |   10 +-
 net/core/netpoll.c                                 |   99 +-
 net/core/netprio_cgroup.c                          |   30 +-
 net/core/scm.c                                     |    4 +
 net/core/sock.c                                    |    1 +
 net/dccp/ccid.h                                    |    4 +-
 net/dccp/ccids/ccid3.c                             |    1 +
 net/ipv4/fib_trie.c                                |    2 +-
 net/ipv4/inet_connection_sock.c                    |    7 +-
 net/ipv4/ip_output.c                               |   10 +-
 net/ipv4/ipmr.c                                    |   14 +-
 net/ipv4/netfilter/nf_nat_sip.c                    |   14 +-
 net/ipv4/route.c                                   |   11 +-
 net/ipv4/tcp.c                                     |    4 +-
 net/ipv4/tcp_cong.c                                |    3 +-
 net/ipv4/tcp_input.c                               |   19 +-
 net/ipv4/tcp_ipv4.c                                |   23 +-
 net/ipv4/tcp_metrics.c                             |   12 +
 net/ipv4/tcp_minisocks.c                           |    2 -
 net/ipv4/tcp_output.c                              |   37 +-
 net/ipv4/tcp_timer.c                               |    6 +-
 net/ipv4/udp.c                                     |    2 +-
 net/ipv6/addrconf.c                                |    4 +-
 net/ipv6/esp6.c                                    |    6 +-
 net/ipv6/proc.c                                    |    4 +-
 net/ipv6/tcp_ipv6.c                                |   29 +-
 net/ipv6/xfrm6_policy.c                            |    8 +
 net/l2tp/l2tp_core.c                               |    3 +-
 net/l2tp/l2tp_core.h                               |    1 +
 net/l2tp/l2tp_ip6.c                                |    1 +
 net/llc/af_llc.c                                   |    8 +-
 net/llc/llc_input.c                                |   21 +-
 net/llc/llc_station.c                              |   29 +-
 net/mac80211/mesh.c                                |    3 +
 net/mac80211/mlme.c                                |    2 +
 net/mac80211/scan.c                                |    3 +-
 net/mac80211/tx.c                                  |   38 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |    5 +-
 net/netfilter/nf_conntrack_core.c                  |   16 +-
 net/netfilter/nf_conntrack_expect.c                |   29 +-
 net/netfilter/nf_conntrack_netlink.c               |   10 +-
 net/netfilter/nf_conntrack_sip.c                   |   92 +-
 net/netfilter/nfnetlink_log.c                      |    6 +-
 net/netlink/af_netlink.c                           |    6 +-
 net/packet/af_packet.c                             |   12 +-
 net/sched/act_gact.c                               |   14 +-
 net/sched/act_ipt.c                                |    7 +-
 net/sched/act_mirred.c                             |   11 +-
 net/sched/act_pedit.c                              |    5 +-
 net/sched/act_simple.c                             |    5 +-
 net/sched/sch_qfq.c                                |   95 +-
 net/socket.c                                       |    5 +-
 net/sunrpc/svc_xprt.c                              |   10 +-
 net/sunrpc/svcsock.c                               |    2 +-
 net/unix/af_unix.c                                 |    4 +-
 net/wireless/core.c                                |    5 +
 net/wireless/core.h                                |    1 +
 net/wireless/reg.c                                 |   19 +-
 net/wireless/util.c                                |    2 +-
 net/xfrm/xfrm_policy.c                             |    2 +
 net/xfrm/xfrm_state.c                              |   25 +-
 scripts/Makefile.fwinst                            |    2 +-
 scripts/checkpatch.pl                              |    3 +-
 scripts/decodecode                                 |    2 +-
 scripts/kernel-doc                                 |    1 +
 scripts/link-vmlinux.sh                            |    2 +-
 security/yama/yama_lsm.c                           |   43 +-
 sound/arm/pxa2xx-ac97.c                            |    4 +-
 sound/atmel/abdac.c                                |    3 +-
 sound/atmel/ac97c.c                                |   14 +-
 sound/core/sgbuf.c                                 |    2 +-
 sound/drivers/aloop.c                              |    2 +-
 sound/drivers/dummy.c                              |    2 +-
 sound/drivers/pcsp/pcsp.c                          |    4 +-
 sound/isa/als100.c                                 |    2 +-
 sound/oss/sb_audio.c                               |    4 +-
 sound/pci/cs46xx/cs46xx_lib.c                      |    2 +-
 sound/pci/ctxfi/ctatc.c                            |    4 +-
 sound/pci/emu10k1/memory.c                         |    5 +-
 sound/pci/hda/hda_auto_parser.c                    |    5 +-
 sound/pci/hda/hda_beep.c                           |   29 +-
 sound/pci/hda/hda_codec.c                          |   83 +-
 sound/pci/hda/hda_codec.h                          |    2 +
 sound/pci/hda/hda_intel.c                          |    9 +
 sound/pci/hda/hda_proc.c                           |    2 +-
 sound/pci/hda/patch_ca0132.c                       |  174 +--
 sound/pci/hda/patch_conexant.c                     |    6 -
 sound/pci/hda/patch_hdmi.c                         |   12 +-
 sound/pci/hda/patch_realtek.c                      |    8 +-
 sound/pci/hda/patch_sigmatel.c                     |   13 +-
 sound/pci/hda/patch_via.c                          |    8 +
 sound/pci/lx6464es/lx6464es.c                      |    2 +
 sound/pci/rme9652/hdspm.c                          |    2 +-
 sound/pci/sis7019.c                                |    5 +-
 sound/ppc/powermac.c                               |    2 +-
 sound/ppc/snd_ps3.c                                |    1 +
 sound/soc/blackfin/bf6xx-sport.c                   |    7 +
 sound/soc/codecs/ab8500-codec.c                    |    4 +
 sound/soc/codecs/ad1980.c                          |    1 +
 sound/soc/codecs/mc13783.c                         |    2 +
 sound/soc/codecs/sgtl5000.c                        |    3 +-
 sound/soc/codecs/stac9766.c                        |    1 +
 sound/soc/codecs/wm5102.c                          |   25 +-
 sound/soc/codecs/wm5110.c                          |   12 +
 sound/soc/codecs/wm8962.c                          |   18 +-
 sound/soc/codecs/wm8994.c                          |   17 +-
 sound/soc/codecs/wm9712.c                          |   22 +-
 sound/soc/codecs/wm9713.c                          |    1 +
 sound/soc/davinci/davinci-mcasp.c                  |   10 +-
 sound/soc/fsl/imx-ssi.c                            |    5 +-
 sound/soc/mxs/Kconfig                              |    2 +-
 sound/soc/mxs/mxs-saif.c                           |   24 +
 sound/soc/omap/mcbsp.c                             |    2 +-
 sound/soc/omap/omap-mcbsp.c                        |    1 +
 sound/soc/omap/omap-pcm.c                          |    1 +
 sound/soc/samsung/pcm.c                            |    2 +-
 sound/soc/soc-core.c                               |   12 +-
 sound/soc/soc-jack.c                               |    2 +-
 sound/soc/tegra/tegra_alc5632.c                    |    2 +-
 sound/soc/tegra/tegra_wm8903.c                     |   10 +-
 sound/soc/ux500/ux500_msp_dai.c                    |    2 +-
 sound/soc/ux500/ux500_msp_i2s.c                    |    2 +-
 sound/soc/ux500/ux500_msp_i2s.h                    |    2 +-
 sound/usb/card.c                                   |    4 +-
 sound/usb/endpoint.c                               |   24 +-
 sound/usb/endpoint.h                               |    3 +-
 sound/usb/pcm.c                                    |   61 +-
 tools/perf/Makefile                                |    7 +-
 tools/perf/builtin-record.c                        |    4 +-
 tools/perf/builtin-report.c                        |    5 +-
 tools/perf/builtin-test.c                          |   19 +-
 tools/perf/builtin-top.c                           |   23 +-
 tools/perf/util/event.h                            |    3 -
 tools/perf/util/evlist.c                           |    7 +
 tools/perf/util/evlist.h                           |    3 +
 tools/perf/util/evsel.c                            |   15 +-
 tools/perf/util/evsel.h                            |   10 +-
 tools/perf/util/header.c                           |    9 +
 tools/perf/util/intlist.c                          |  101 ++
 tools/perf/util/intlist.h                          |   75 +
 tools/perf/util/parse-events-test.c                |   12 +-
 tools/perf/util/parse-options.c                    |    3 +
 tools/perf/util/python-ext-sources                 |    2 +
 tools/perf/util/python.c                           |    6 +-
 tools/perf/util/rblist.c                           |  107 ++
 tools/perf/util/rblist.h                           |   47 +
 tools/perf/util/session.c                          |   48 +-
 tools/perf/util/session.h                          |   24 +-
 tools/perf/util/strlist.c                          |  130 +-
 tools/perf/util/strlist.h                          |   11 +-
 tools/perf/util/symbol.c                           |   14 +-
 tools/perf/util/target.c                           |    2 +-
 virt/kvm/kvm_main.c                                |    7 +-
 1408 files changed, 19410 insertions(+), 11578 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/misc/ifm-csi.txt
 create mode 100644 arch/alpha/include/asm/word-at-a-time.h
 delete mode 100644 arch/alpha/lib/ev6-strncpy_from_user.S
 delete mode 100644 arch/alpha/lib/ev67-strlen_user.S
 delete mode 100644 arch/alpha/lib/strlen_user.S
 delete mode 100644 arch/alpha/lib/strncpy_from_user.S
 create mode 100644 arch/arm/lib/io-readsw-armv3.S
 create mode 100644 arch/arm/lib/io-writesw-armv3.S
 create mode 100644 arch/arm/lib/uaccess.S
 rename arch/arm/mach-imx/{head-v7.S => headsmp.S} (100%)
 create mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h
 delete mode 100644 arch/m68k/include/asm/MC68332.h
 delete mode 100644 arch/m68k/include/asm/apollodma.h
 delete mode 100644 arch/m68k/include/asm/bitsperlong.h
 delete mode 100644 arch/m68k/include/asm/cputime.h
 delete mode 100644 arch/m68k/include/asm/device.h
 delete mode 100644 arch/m68k/include/asm/emergency-restart.h
 delete mode 100644 arch/m68k/include/asm/errno.h
 delete mode 100644 arch/m68k/include/asm/futex.h
 delete mode 100644 arch/m68k/include/asm/ioctl.h
 delete mode 100644 arch/m68k/include/asm/ipcbuf.h
 delete mode 100644 arch/m68k/include/asm/irq_regs.h
 delete mode 100644 arch/m68k/include/asm/kdebug.h
 delete mode 100644 arch/m68k/include/asm/kmap_types.h
 delete mode 100644 arch/m68k/include/asm/kvm_para.h
 delete mode 100644 arch/m68k/include/asm/local.h
 delete mode 100644 arch/m68k/include/asm/local64.h
 delete mode 100644 arch/m68k/include/asm/mac_mouse.h
 delete mode 100644 arch/m68k/include/asm/mcfmbus.h
 delete mode 100644 arch/m68k/include/asm/mman.h
 delete mode 100644 arch/m68k/include/asm/mutex.h
 delete mode 100644 arch/m68k/include/asm/percpu.h
 delete mode 100644 arch/m68k/include/asm/resource.h
 delete mode 100644 arch/m68k/include/asm/sbus.h
 delete mode 100644 arch/m68k/include/asm/scatterlist.h
 delete mode 100644 arch/m68k/include/asm/sections.h
 delete mode 100644 arch/m68k/include/asm/shm.h
 delete mode 100644 arch/m68k/include/asm/siginfo.h
 delete mode 100644 arch/m68k/include/asm/statfs.h
 delete mode 100644 arch/m68k/include/asm/topology.h
 delete mode 100644 arch/m68k/include/asm/types.h
 delete mode 100644 arch/m68k/include/asm/xor.h
 create mode 100644 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/o2d.dts
 create mode 100644 arch/powerpc/boot/dts/o2d.dtsi
 create mode 100644 arch/powerpc/boot/dts/o2d300.dts
 create mode 100644 arch/powerpc/boot/dts/o2dnt2.dts
 create mode 100644 arch/powerpc/boot/dts/o2i.dts
 create mode 100644 arch/powerpc/boot/dts/o2mnt.dts
 create mode 100644 arch/powerpc/boot/dts/o3dnt.dts
 delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
 delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
 create mode 100644 arch/powerpc/boot/dts/p1022rdk.dts
 delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
 delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
 create mode 100644 arch/powerpc/boot/dts/p5040ds.dts
 delete mode 100644 arch/powerpc/include/asm/abs_addr.h
 create mode 100644 arch/powerpc/include/asm/probes.h
 create mode 100644 arch/powerpc/include/asm/uprobes.h
 create mode 100644 arch/powerpc/kernel/uprobes.c
 create mode 100644 arch/powerpc/platforms/85xx/p1022_rdk.c
 create mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c
 create mode 100644 arch/powerpc/platforms/pseries/eeh_pe.c
 create mode 100644 arch/powerpc/sysdev/fsl_mpic_err.c
 create mode 100644 drivers/vhost/Kconfig.tcm
 create mode 100644 drivers/vhost/tcm_vhost.c
 create mode 100644 drivers/vhost/tcm_vhost.h
 create mode 100644 tools/perf/util/intlist.c
 create mode 100644 tools/perf/util/intlist.h
 create mode 100644 tools/perf/util/rblist.c
 create mode 100644 tools/perf/util/rblist.h

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

[Benjamin Herrenschmidt]

On Wed, 2012-09-05 at 16:12 +1000, Benjamin Herrenschmidt wrote:
> The following changes since commit
> 5b716ac728bcc01b1f2a7ed6e437196602237c27:
> 
>   Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
> (2012-09-02 11:30:10 -0700)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git 

Little glitch, the mirrors hadn't caught up yet when I use git
request-pull so it didn't append the branch name. It's "merge" as the
subject implies.

Cheers,
Ben.

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few fixes for 3.6 that were piling up while I was away or
busy (I was mostly MIA a week or two before San Diego). Some fixes from
Anton fixing up issues with our relatively new DSCR control feature,
and a few other fixes that are either regressions or bugs nasty enough
to warrant not waiting.

Cheers,
Ben.

The following changes since commit 5b716ac728bcc01b1f2a7ed6e437196602237c27:

  Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 (2012-09-02 11:30:10 -0700)

are available in the git repository at:


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

for you to fetch changes up to 636802ef96eebe279b22ad9f9dacfe29291e45c7:

  powerpc: Don't use __put_user() in patch_instruction (2012-09-05 16:05:23 +1000)

----------------------------------------------------------------
Anton Blanchard (4):
      powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
      powerpc: Keep thread.dscr and thread.dscr_inherit in sync
      powerpc: Fix DSCR inheritance in copy_thread()
      powerpc: Restore correct DSCR in context switch

Benjamin Herrenschmidt (1):
      powerpc: Don't use __put_user() in patch_instruction

Jesse Larrew (1):
      powerpc/vphn: Fix arch_update_cpu_topology() return value

Paul Mackerras (3):
      powerpc: Give hypervisor decrementer interrupts their own handler
      powerpc/powernv: Always go into nap mode when CPU is offline
      powerpc: Make sure IPI handlers see data written by IPI senders

 arch/powerpc/include/asm/processor.h |    1 +
 arch/powerpc/kernel/asm-offsets.c    |    1 +
 arch/powerpc/kernel/dbell.c          |    2 ++
 arch/powerpc/kernel/entry_64.S       |   23 +++++++++++++++++------
 arch/powerpc/kernel/exceptions-64s.S |    3 ++-
 arch/powerpc/kernel/idle_power7.S    |    2 ++
 arch/powerpc/kernel/process.c        |   12 ++----------
 arch/powerpc/kernel/smp.c            |   11 +++++++++--
 arch/powerpc/kernel/sysfs.c          |   10 ++++++++++
 arch/powerpc/kernel/time.c           |    9 +++++++++
 arch/powerpc/kernel/traps.c          |    3 ++-
 arch/powerpc/lib/code-patching.c     |    2 +-
 arch/powerpc/mm/numa.c               |    7 ++++---
 arch/powerpc/platforms/powernv/smp.c |   10 +---------
 arch/powerpc/sysdev/xics/icp-hv.c    |    6 +++++-
 15 files changed, 68 insertions(+), 34 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

I meant to sent that earlier but got swamped with other things, so here
are some powerpc fixes for 3.6. A few regression fixes and some bug
fixes that I deemed should still make it.

There's a FSL update from Kumar with a bunch of defconfig updates along
with a few embedded fixes.

I also reverted my g5_defconfig update that I merged earlier as it was
completely busted, not too sure what happened there, I'll do a new one
later.

Cheers,
Ben.

The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:

  Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)

are available in the git repository at:

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

for you to fetch changes up to 2c39bf49fd05305bea6d70670855047b2191d3f5:

  Revert "powerpc: Update g5_defconfig" (2012-08-24 20:55:55 +1000)

----------------------------------------------------------------
Aaro Koskinen (1):
      powerpc/dma-iommu: Fix IOMMU window check

Anton Blanchard (2):
      powerpc: POWER7 copy_to_user/copy_from_user patch applied twice
      powerpc: Fix VMX in interrupt check in POWER7 copy loops

Benjamin Herrenschmidt (1):
      Revert "powerpc: Update g5_defconfig"

Jia Hongtao (1):
      powerpc/fsl-pci: Only scan PCI bus if configured as a host

Jiri Kosina (1):
      powerpc: Fix personality handling in ppc64_personality()

Kim Phillips (2):
      powerpc/fsl: update defconfigs
      powerpc/fsl: fix "Failed to mount /dev: No such device" errors

Michael Ellerman (2):
      powerpc: Fix xmon dl command for new printk implementation
      powerpc: Fixup whitespace in xmon

Michael Neuling (2):
      powerpc: Fix null pointer deref in perf hardware breakpoints
      powerpc: Remove unnecessary ifdefs

Scott Wood (1):
      powerpc/mpic_msgr: Add missing includes

Shengzhou Liu (1):
      powerpc/p4080ds: dts - add usb controller version info and port0

Sukadev Bhattiprolu (1):
      powerpc/perf: Use pmc_overflow() to detect rolled back events

Tiejun Chen (4):
      booke/wdt: some ioctls do not return values properly
      powerpc/kgdb: Do not set kgdb_single_step on ppc
      powerpc/kgdb: Bail out of KGDB when we've been triggered
      powerpc/kgdb: Restore current_thread_info properly

Zhao Chenhui (1):
      powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS

 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi  |    7 ++
 arch/powerpc/configs/85xx/p1023rds_defconfig |   31 +++-----
 arch/powerpc/configs/corenet32_smp_defconfig |   29 +++-----
 arch/powerpc/configs/corenet64_smp_defconfig |    1 +
 arch/powerpc/configs/g5_defconfig            |  103 ++++++++++++++++++--------
 arch/powerpc/configs/mpc83xx_defconfig       |   18 ++---
 arch/powerpc/configs/mpc85xx_defconfig       |   33 +++------
 arch/powerpc/configs/mpc85xx_smp_defconfig   |   32 ++------
 arch/powerpc/include/asm/cputable.h          |    2 -
 arch/powerpc/include/asm/mpic_msgr.h         |    1 +
 arch/powerpc/kernel/dma-iommu.c              |    9 +--
 arch/powerpc/kernel/hw_breakpoint.c          |    2 +-
 arch/powerpc/kernel/kgdb.c                   |   27 ++++++-
 arch/powerpc/kernel/syscalls.c               |    8 +-
 arch/powerpc/lib/copyuser_power7.S           |   35 +--------
 arch/powerpc/lib/memcpy_power7.S             |    4 +-
 arch/powerpc/perf/core-book3s.c              |    2 +-
 arch/powerpc/sysdev/fsl_pci.c                |   13 ++--
 arch/powerpc/sysdev/mpic_msgr.c              |    3 +
 arch/powerpc/xmon/xmon.c                     |   84 +++++++++------------
 drivers/watchdog/booke_wdt.c                 |    7 +-
 21 files changed, 209 insertions(+), 242 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Kumar sent me a handful of Freescale related fixes and I added
another regression fix to the pile.

Cheers,
Ben.

PS. I -will- eventually learn about that signed tag business :-)

The following changes since commit 1fad1e9a747687a7399bf58e87974f9b1bbcae06:

  Merge tag 'nfs-for-3.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (2012-07-30 19:16:57 -0700)

are available in the git repository at:


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

for you to fetch changes up to ad36cb0d1d3e2b7f161cd33932433f9349cade1e:

  powerpc/kvm/book3s_32: Fix MTMSR_EERI macro (2012-07-31 15:21:20 +1000)

----------------------------------------------------------------
Alexander Graf (1):
      powerpc/kvm/book3s_32: Fix MTMSR_EERI macro

Benjamin Herrenschmidt (1):
      Merge remote-tracking branch 'kumar/merge' into merge

Claudiu Manoil (1):
      powerpc/85xx: Fix sram_offset parameter type

Shaohui Xie (1):
      powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz

Tang Yuantian (1):
      powerpc/85xx: Fix pci base address error for p2020rdb-pc in dts

Timur Tabi (2):
      powerpc/85xx: p1022ds: disable the NAND flash node if video is enabled
      powerpc/85xx: p1022ds: fix DIU/LBC switching with NAND enabled

 arch/powerpc/boot/dts/p2020rdb-pc_32b.dts |    4 +-
 arch/powerpc/boot/dts/p2020rdb-pc_36b.dts |    4 +-
 arch/powerpc/boot/dts/p3041ds.dts         |    2 +-
 arch/powerpc/kvm/book3s_rmhandlers.S      |    1 -
 arch/powerpc/platforms/85xx/p1022_ds.c    |  122 +++++++++++++++++++++++------
 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h |    4 +-
 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c     |   39 ++++-----
 7 files changed, 121 insertions(+), 55 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a handful of powerpc patches, a couple of regression fixes
for problems introduced in the main batch in this merge window,
a couple of defconfig updates, and some trivials. The radeonfb
one is something that was long standing in SLES which I forgot
to pickup earlier.

Cheers,
Ben.

The following changes since commit bdc0077af574800d24318b6945cf2344e8dbb050:

  Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (2012-07-24 18:11:22 -0700)

are available in the git repository at:


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

for you to fetch changes up to bac821a6e3404330d509fd3a245bf7701f210c7c:

  powerpc/ftrace: Trace function graph entry before updating index (2012-07-27 11:42:34 +1000)

----------------------------------------------------------------
Alexander Graf (1):
      powerpc/kvm/bookehv: Fix build regression

Anton Blanchard (2):
      powerpc: Enable pseries hardware RNG and crypto modules
      powerpc: Lack of firmware flash support is not an error

Benjamin Herrenschmidt (1):
      powerpc: Update g5_defconfig

Steven Rostedt (1):
      powerpc/ftrace: Trace function graph entry before updating index

Stuart Yoder (1):
      powerpc: Set stack limit properly in crit_transfer_to_handler

Tony Breeds (1):
      radeonfb: Add quirk for the graphics adapter in some JSxx

 arch/powerpc/configs/g5_defconfig      |  103 ++++++++++----------------------
 arch/powerpc/configs/ppc64_defconfig   |    6 +-
 arch/powerpc/configs/pseries_defconfig |    6 +-
 arch/powerpc/kernel/entry_32.S         |   12 +++-
 arch/powerpc/kernel/ftrace.c           |   11 ++--
 arch/powerpc/kernel/rtas_flash.c       |    2 +-
 arch/powerpc/kvm/bookehv_interrupts.S  |   77 ++++++++++++------------
 drivers/video/aty/radeon_monitor.c     |   35 +++++++++++
 8 files changed, 128 insertions(+), 124 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

It looks like my rewrite of our lazy irq scheme is still exposing
"interesting" issues left and right. The previous fixes are now
causing an occasional BUG_ON to trigger (which this patch turns
into a WARN_ON while at it), due to another issue of disconnect
of the lazy irq state vs. the processor state in the idle loop
on pseries and cell.

This should fix it properly once for all moving the nasty code to a common
helper function.

There's also couple more fixes for some debug stuff that didn't build
(and helped resolving those problems so it's worth having), along with
a compile fix for newer gcc's.

Cheers,
Ben.

The following changes since commit 2437fccfbfc83bcb868ccc7fdfe2b5310bf07835:

  Merge tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator (2012-07-09 13:43:02 -0700)

are available in the git repository at:

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

for you to fetch changes up to 50fb31cfed9218b439360caf7c0399b00042da15:

  tty/hvc_opal: Fix debug function name (2012-07-10 19:16:25 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (4):
      powerpc: More fixes for lazy IRQ vs. idle
      powerpc: Fix build of some debug irq code
      powerpc/numa: Avoid stupid uninitialized warning from gcc
      tty/hvc_opal: Fix debug function name

 arch/powerpc/include/asm/hw_irq.h               |    6 ++-
 arch/powerpc/kernel/irq.c                       |   48 ++++++++++++++++++++++-
 arch/powerpc/mm/numa.c                          |    2 +-
 arch/powerpc/platforms/cell/pervasive.c         |   11 +++---
 arch/powerpc/platforms/pseries/processor_idle.c |   17 ++++----
 drivers/tty/hvc/hvc_opal.c                      |    2 +-
 6 files changed, 69 insertions(+), 17 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus 

Here are two more fixes that I "missed" when scrubbing patchwork last
week which are worth still having in 3.5.

Cheers,
Ben.

The following changes since commit bc6dc752f35488160ffac07ae91bed1bddaea32a:

  powerpc/pseries: Fix software invalidate TCE (2012-06-29 14:35:37 +1000)

are available in the git repository at:

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

for you to fetch changes up to 2f584a146a2965b82fce89b8d2f95dc5cfe468d0:

  powerpc/kvm: sldi should be sld (2012-07-02 14:30:12 +1000)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc/xmon: Use cpumask iterator to avoid warning

Michael Neuling (1):
      powerpc/kvm: sldi should be sld

 arch/powerpc/kvm/book3s_hv_rmhandlers.S |    2 +-
 arch/powerpc/xmon/xmon.c                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few powerpc fixes. Arguably some of this should have come to
you earlier but I'm only just catching up after my medical leave.

Mostly these fixes regressions, a couple are long standing bugs.

Cheers,
Ben.

The following changes since commit 9acc7bde23ebb19a704395f76490685e1513e422:

  Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (2012-06-28 12:38:51 -0700)

are available in the git repository at:


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

for you to fetch changes up to bc6dc752f35488160ffac07ae91bed1bddaea32a:

  powerpc/pseries: Fix software invalidate TCE (2012-06-29 14:35:37 +1000)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc: check_and_cede_processor() never cedes

Li Zhong (1):
      powerpc: Fix Section mismatch warnings in prom_init.c

Michael Ellerman (1):
      powerpc: Fix BPF_JIT code to link with multiple TOCs

Michael Neuling (2):
      powerpc: Fix uninitialised error in numa.c
      powerpc/pseries: Fix software invalidate TCE

Steven Rostedt (1):
      powerpc/ftrace: Do not trace restore_interrupts()

Tiejun Chen (1):
      ppc64: fix missing to check all bits of _TIF_USER_WORK_MASK in preempt

 arch/powerpc/include/asm/hw_irq.h               |    5 ++
 arch/powerpc/kernel/entry_64.S                  |   97 ++++++++++-------------
 arch/powerpc/kernel/irq.c                       |    2 +-
 arch/powerpc/kernel/prom_init.c                 |    4 +-
 arch/powerpc/mm/numa.c                          |    2 +-
 arch/powerpc/net/bpf_jit_64.S                   |    2 +
 arch/powerpc/platforms/pseries/iommu.c          |    4 +-
 arch/powerpc/platforms/pseries/processor_idle.c |    2 +-
 8 files changed, 54 insertions(+), 64 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

It looks like my previous fix for the lazy irq masking problem wasn't
quite enough. There was another problem related to performance monitor
interrupts acting as NMIs leaving the flags in an incorrect state.
Here's a fix that finally seems to make perf solid again.

The following changes since commit 4e25651b70b8d6ded7229ead8181619e121b648d:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu (2012-05-11 09:28:35 -0700)

are available in the git repository at:


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

for you to fetch changes up to 7c0482e3d055e5de056d3c693b821e39205b99ae:

  powerpc/irq: Fix another case of lazy IRQ state getting out of sync (2012-05-12 09:40:41 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (1):
      powerpc/irq: Fix another case of lazy IRQ state getting out of sync

 arch/powerpc/kernel/entry_64.S |   44 ++++++++++++++++++++++++++++------------
 arch/powerpc/kernel/irq.c      |   13 ++++++++++++
 2 files changed, 44 insertions(+), 13 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a couple of last minute fixes for 3.4 for regressions
introduced by my rewrite of the lazy irq masking code.

Cheers,
Ben.

The following changes since commit 810b4de25e53459323ff48957b0162b48d6cbd57:

  tty/serial/pmac_zilog: Fix "nobody cared" IRQ message (2012-04-30 10:59:58 +1000)

are available in the git repository at:

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

for you to fetch changes up to a3512b2dd57cb653bb33645ca9c934436e547e3c:

  powerpc/irq: Make alignment & program interrupt behave the same (2012-05-09 09:42:33 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (2):
      powerpc/irq: Fix bug with new lazy IRQ handling code
      powerpc/irq: Make alignment & program interrupt behave the same

 arch/powerpc/include/asm/exception-64s.h |    7 -------
 arch/powerpc/kernel/entry_64.S           |   18 ------------------
 arch/powerpc/kernel/exceptions-64s.S     |    2 +-
 arch/powerpc/kernel/irq.c                |    8 +++++++-
 arch/powerpc/kernel/traps.c              |   10 ++++++++--
 5 files changed, 16 insertions(+), 29 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a handful more fixes for powerpc. The irq stuff are all
regression fixes, and Gavin's patch is a simple compile fix.

Cheers,
Ben.

The following changes since commit 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a:

  Linux 3.4-rc5 (2012-04-29 15:19:10 -0700)

are available in the git repository at:

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

for you to fetch changes up to 810b4de25e53459323ff48957b0162b48d6cbd57:

  tty/serial/pmac_zilog: Fix "nobody cared" IRQ message (2012-04-30 10:59:58 +1000)

----------------------------------------------------------------
Gavin Shan (1):
      powerpc/pseries: Rivet CONFIG_EEH for pSeries platform

Grant Likely (2):
      powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller
      powerpc/irqdomain: Fix broken NR_IRQ references

Larry Finger (1):
      tty/serial/pmac_zilog: Fix "nobody cared" IRQ message

 arch/powerpc/include/asm/irq.h               |    4 --
 arch/powerpc/kernel/irq.c                    |    6 +--
 arch/powerpc/kernel/machine_kexec.c          |    7 +--
 arch/powerpc/platforms/cell/axon_msi.c       |    8 ++--
 arch/powerpc/platforms/cell/beat_interrupt.c |    2 +-
 arch/powerpc/platforms/powermac/pic.c        |    6 +--
 arch/powerpc/platforms/pseries/Kconfig       |    4 +-
 arch/powerpc/sysdev/cpm2_pic.c               |    3 +-
 arch/powerpc/sysdev/mpc8xx_pic.c             |   61 +++++++++-----------------
 arch/powerpc/sysdev/xics/xics-common.c       |    7 ++-
 drivers/tty/serial/pmac_zilog.c              |    6 +--
 11 files changed, 39 insertions(+), 75 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few fixes for powerpc. Note the addition to the generic
irq.h. This is part of a 3-patches regression fix for mpic due to
changes in how IRQ_TYPE_NONE is being handled. Thomas agreed to the
addition of the new IRQ_TYPE_DEFAULT contant, however he hasn't
replied with an Ack to the actual patch yet. I don't to wait much
longer with these patches tho.

Cheers,
Ben.

The following changes since commit 932e9f352b5d685725076f21b237f7c7d804b29c:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (2012-04-18 20:16:02 -0700)

are available in the git repository at:


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

for you to fetch changes up to 446f6d06fab0b49c61887ecbe8286d6aaa796637:

  powerpc/mpic: Properly set default triggers (2012-04-23 11:04:30 +1000)

----------------------------------------------------------------
Baruch Siach (1):
      powerpc: fix build when CONFIG_BOOKE_WDT is enabled

Benjamin Herrenschmidt (5):
      Merge remote-tracking branch 'kumar/merge' into merge
      powerpc/pmac: Don't add_timer() twice
      powerpc/mpic: Fix confusion between hw_irq and virq
      irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers
      powerpc/mpic: Properly set default triggers

Gavin Shan (1):
      powerpc/eeh: Fix crash caused by null eeh_dev

Mingkai Hu (4):
      powerpc/mpic_msgr: fix compile error when SMP disabled
      powerpc/mpic_msgr: add lock for MPIC message global variable
      powerpc/mpic_msgr: fix offset error when setting mer register
      powerpc/mpc85xx: add MPIC message dts node

Timur Tabi (1):
      powerpc/85xx: don't call of_platform_bus_probe() twice

 arch/powerpc/boot/dts/fsl/pq3-mpic-message-B.dtsi |   43 ++++++++++++++++
 arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi           |   10 ++++
 arch/powerpc/include/asm/mpic.h                   |   18 -------
 arch/powerpc/include/asm/mpic_msgr.h              |    1 +
 arch/powerpc/include/asm/reg_booke.h              |    5 --
 arch/powerpc/kernel/setup_32.c                    |    3 ++
 arch/powerpc/platforms/85xx/common.c              |    6 +++
 arch/powerpc/platforms/85xx/mpc85xx_mds.c         |   11 +----
 arch/powerpc/platforms/85xx/p1022_ds.c            |   13 +----
 arch/powerpc/platforms/powermac/low_i2c.c         |    9 ++++
 arch/powerpc/platforms/pseries/eeh.c              |    2 +-
 arch/powerpc/sysdev/mpic.c                        |   54 +++++++++++++--------
 arch/powerpc/sysdev/mpic_msgr.c                   |   12 ++---
 include/linux/irq.h                               |    7 +++
 14 files changed, 122 insertions(+), 72 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic-message-B.dtsi

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are fixes for two nasty regression affecting powerpc in 3.4.

Please apply,

Cheers,
Ben.

The following changes since commit b1a808ff436343956a6ae63178ea1810c5e5a3a1:

  Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi (2012-04-02 09:50:40 -0700)

are available in the git repository at:


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

for you to fetch changes up to fae2e0fb24c61ca68c98d854a34732549ebc1854:

  powerpc: Fix typo in runlatch code (2012-04-11 10:42:15 +1000)

----------------------------------------------------------------
Benjamin Herrenschmidt (2):
      powerpc: Fix page fault with lockdep regression
      powerpc: Fix typo in runlatch code

 arch/powerpc/kernel/entry_32.S |   39 +++++++++++++++++++++------------------
 arch/powerpc/kernel/process.c  |    4 ++--
 2 files changed, 23 insertions(+), 20 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This contains a couple more fixes for the system.h disintegration,
a trivial section mismatch fix, a couple of patches from akpm that I
didn't quite get he expected me to pickup, and a few more trivialities
form Kumar that he appear to have forgotten to send me in the previous
batch.

Cheers,
Ben.

The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:

  Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)

are available in the git repository at:

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

for you to fetch changes up to 9b218f63e50e590fe0c7724a0838d7eaa6dae5ce:

  powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart (2012-04-02 14:31:19 +1000)

----------------------------------------------------------------
Andrew Morton (1):
      powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart

Benjamin Herrenschmidt (2):
      Merge remote-tracking branch 'kumar/next' into merge
      powerpc/kvm: Fallout from system.h disintegration

Dave Liu (1):
      powerpc/qe: Update the SNUM table for MPC8569 Rev2.0

Diana CRACIUN (1):
      powerpc/dts: Removed fsl,msi property from dts.

Jerry Huang (2):
      powerpc/85xx: add the P1020MBG-PC DTS support
      powerpc/85xx: add the P1020UTM-PC DTS support

Oleg Nesterov (1):
      powerpc/eeh: Remove eeh_event_handler()->daemonize()

Shaveta Leekha (1):
      powerpc/85xx: Enable I2C_CHARDEV and I2C_MPC options in defconfigs

Stephen Rothwell (1):
      powerpc: Fix fallout from system.h split up

Timur Tabi (2):
      powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.h
      powerpc/epapr: add "memory" as a clobber to all hypercalls

Uwe Kleine-König (1):
      powerpc: Mark const init data with __initconst instead of __initdata

 arch/powerpc/boot/dts/p1020mbg-pc.dtsi       |  151 ++++++++++++++++++++++++++
 arch/powerpc/boot/dts/p1020mbg-pc_32b.dts    |   89 +++++++++++++++
 arch/powerpc/boot/dts/p1020mbg-pc_36b.dts    |   89 +++++++++++++++
 arch/powerpc/boot/dts/p1020utm-pc.dtsi       |  140 ++++++++++++++++++++++++
 arch/powerpc/boot/dts/p1020utm-pc_32b.dts    |   89 +++++++++++++++
 arch/powerpc/boot/dts/p1020utm-pc_36b.dts    |   89 +++++++++++++++
 arch/powerpc/boot/dts/p2041rdb.dts           |    3 -
 arch/powerpc/boot/dts/p3041ds.dts            |    4 -
 arch/powerpc/boot/dts/p3060qds.dts           |    2 -
 arch/powerpc/boot/dts/p4080ds.dts            |    3 -
 arch/powerpc/boot/dts/p5020ds.dts            |    4 -
 arch/powerpc/configs/corenet32_smp_defconfig |    1 +
 arch/powerpc/configs/corenet64_smp_defconfig |    2 +
 arch/powerpc/configs/mpc85xx_defconfig       |    1 +
 arch/powerpc/configs/mpc85xx_smp_defconfig   |    1 +
 arch/powerpc/include/asm/epapr_hcalls.h      |    7 +-
 arch/powerpc/include/asm/fsl_guts.h          |   26 +----
 arch/powerpc/kernel/fadump.c                 |    2 +
 arch/powerpc/kernel/kgdb.c                   |    1 +
 arch/powerpc/kvm/book3s_emulate.c            |    1 +
 arch/powerpc/kvm/book3s_paired_singles.c     |    1 +
 arch/powerpc/kvm/book3s_pr.c                 |    1 +
 arch/powerpc/platforms/52xx/mpc52xx_pci.c    |    2 +-
 arch/powerpc/platforms/85xx/mpc85xx_mds.c    |    2 +-
 arch/powerpc/platforms/85xx/mpc85xx_rdb.c    |    2 +-
 arch/powerpc/platforms/85xx/p1022_ds.c       |    4 +-
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c   |    2 +-
 arch/powerpc/platforms/cell/qpace_setup.c    |    2 +-
 arch/powerpc/platforms/cell/setup.c          |    2 +-
 arch/powerpc/platforms/pseries/eeh_event.c   |    4 +-
 arch/powerpc/sysdev/qe_lib/qe.c              |   22 +++-
 drivers/net/ethernet/freescale/ucc_geth.c    |    6 +-
 sound/soc/fsl/mpc8610_hpcd.c                 |    8 +-
 sound/soc/fsl/p1022_ds.c                     |   10 +-
 34 files changed, 712 insertions(+), 61 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/p1020mbg-pc.dtsi
 create mode 100644 arch/powerpc/boot/dts/p1020mbg-pc_32b.dts
 create mode 100644 arch/powerpc/boot/dts/p1020mbg-pc_36b.dts
 create mode 100644 arch/powerpc/boot/dts/p1020utm-pc.dtsi
 create mode 100644 arch/powerpc/boot/dts/p1020utm-pc_32b.dts
 create mode 100644 arch/powerpc/boot/dts/p1020utm-pc_36b.dts

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc bits for you. A stupid regression I
introduced with my previous commit to "fix" program check exceptions
(brown paper bag for me), fix the cpuidle default, a bug fix for
something that isn't strictly speaking a regression but some
upstream changes causes it to show in lockdep now while it didn't
before, and finally a trivial one for rusty to make his life
easier later on removing the old cpumask cruft.

Cheers,
Ben.

The following changes since commit 27e74da9800289e69ba907777df1e2085231eff7:

  i387: export 'fpu_owner_task' per-cpu variable (2012-02-20 19:34:10 -0800)

are available in the git repository at:

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

for you to fetch changes up to 18b246fa60dd4bfc71c78d669e2ffaa5df454d6a:

  powerpc: Fix various issues with return to userspace (2012-02-22 16:48:53 +1100)

----------------------------------------------------------------
Benjamin Herrenschmidt (2):
      cpuidle: Default y on powerpc pSeries
      powerpc: Fix various issues with return to userspace

Michael Ellerman (1):
      powerpc: Fix program check handling when lockdep is enabled

Rusty Russell (1):
      powerpc: Remove references to cpu_*_map

 arch/powerpc/kernel/entry_32.S       |    2 +-
 arch/powerpc/kernel/entry_64.S       |    6 +++++-
 arch/powerpc/kernel/exceptions-64s.S |    2 +-
 arch/powerpc/kernel/signal.c         |   12 ++++++++----
 arch/powerpc/kernel/signal.h         |    2 +-
 arch/powerpc/platforms/wsp/smp.c     |    2 +-
 drivers/cpuidle/Kconfig              |    2 +-
 7 files changed, 18 insertions(+), 10 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more fixes for powerpc. Some are regressions, the rest is
simple/obvious/nasty enough that I deemed it good to go now.

Here's also step one of deprecating legacy iSeries support: we are
removing it from the main defconfig.

Nobody seems to be using it anymore and the code is nasty to maintain,
(involves horrible hacks in various low level areas of the kernel) so we
plan to actually rip it out at some point. For now let's just avoid
building it by default. Stephen will proceed to do the actual removal
later (probably 3.4 or 3.5).

Cheers,
Ben.

The following changes since commit 778a785f02ad846446e91dab49331bd7d853c514:

  powerpc/pseries/eeh: Fix crash when error happens during device probe (2012-02-14 15:01:39 +1100)

are available in the git repository at:

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

for you to fetch changes up to 9a45a9407c69d068500923480884661e2b9cc421:

  powerpc/perf: power_pmu_start restores incorrect values, breaking frequency events (2012-02-16 16:24:35 +1100)

----------------------------------------------------------------
Anton Blanchard (1):
      powerpc/perf: power_pmu_start restores incorrect values, breaking frequency events

Benjamin Herrenschmidt (2):
      powerpc/fsl/pci: Fix PCIe fixup regression
      powerpc: Disable interrupts early in Program Check

Ira Snyder (1):
      powerpc: Fix kernel log of oops/panic instruction dump

Stephen Rothwell (1):
      powerpc: Remove legacy iSeries from ppc64_defconfig

majianpeng (1):
      powerpc/adb: Use set_current_state()

 arch/powerpc/configs/ppc64_defconfig |    5 ---
 arch/powerpc/kernel/exceptions-64s.S |    2 +-
 arch/powerpc/kernel/perf_event.c     |    8 +++++-
 arch/powerpc/kernel/process.c        |    6 ++--
 arch/powerpc/sysdev/fsl_pci.c        |   48 ++++++++++++++++++++-------------
 drivers/macintosh/adb.c              |    4 +-
 6 files changed, 42 insertions(+), 31 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few powerpc fixes for 3.3, all pretty trivial. I also
added the patch to define GET_IP/SET_IP so we can use some more
asm-generic goodness.

Cheers,
Ben.

The following changes since commit 3ec1e88b33a3bdd852ce8e014052acec7a9da8b5:

  Merge branch 'for-linus' of git://git.kernel.dk/linux-block (2012-02-11 10:07:11 -0800)

are available in the git repository at:


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

for you to fetch changes up to 778a785f02ad846446e91dab49331bd7d853c514:

  powerpc/pseries/eeh: Fix crash when error happens during device probe (2012-02-14 15:01:39 +1100)

----------------------------------------------------------------
Benjamin Herrenschmidt (3):
      powerpc/wsp: Permanently enable PCI class code workaround
      powerpc/wsp: Fix IRQ affinity setting
      powerpc: Fix WARN_ON in decrementer_check_overflow

Brian King (1):
      powerpc/pseries: Fix partition migration hang in stop_topology_update

Michael Ellerman (1):
      powerpc/powernv: Disable interrupts while taking phb->lock

Srikar Dronamraju (1):
      powerpc: Implement GET_IP/SET_IP

Thadeu Lima de Souza Cascardo (1):
      powerpc/pseries/eeh: Fix crash when error happens during device probe

 arch/powerpc/include/asm/ppc-pci.h       |    5 +++++
 arch/powerpc/include/asm/ptrace.h        |   20 ++++++++++++--------
 arch/powerpc/kernel/irq.c                |    6 +++++-
 arch/powerpc/kernel/rtas.c               |    5 +++--
 arch/powerpc/platforms/powernv/pci.c     |   22 ++++++++++++++--------
 arch/powerpc/platforms/pseries/eeh.c     |    4 ++--
 arch/powerpc/platforms/pseries/suspend.c |    6 +++++-
 arch/powerpc/platforms/wsp/ics.c         |    2 +-
 arch/powerpc/platforms/wsp/wsp_pci.c     |    8 ++++----
 9 files changed, 51 insertions(+), 27 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few fixes on top of rc1, a couple of important compile
regressions and a couple of minor embedded additions.

Cheers,
Ben.

The following changes since commit 4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518:

  regulator: Fix documentation for of_node parameter of regulator_register() (2012-01-24 10:40:06 -0800)

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

Benjamin Herrenschmidt (3):
      Merge remote-tracking branch 'kumar/merge' into merge
      powerpc/powernv: Fix PCI resource handling
      powerpc: Fix build on some non-freescale platforms

Christian Kujau (1):
      powerpc/crash: Fix build error without SMP

Deepthi Dharwar (1):
      powerpc/cpuidle: Make it a bool, not a tristate

Jerry Huang (1):
      powerpc/85xx: Fix cmd12 bug and add the chip compatible for eSDHC

Julia Lawall (1):
      arch/powerpc/sysdev/fsl_pci.c: add missing iounmap

Michael Neuling (1):
      powerpc: fix compile error with 85xx/p1022_ds.c

Ramneek Mehresh (2):
      powerpc/85xx: Enable USB2 controller node for P1020RDB
      powerpc/85xx: Add dr_mode property in USB nodes

 arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi |    4 ++
 arch/powerpc/boot/dts/fsl/p1010si-post.dtsi   |    3 +-
 arch/powerpc/boot/dts/fsl/p1020si-post.dtsi   |    4 ++
 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi   |    3 +-
 arch/powerpc/boot/dts/fsl/p2020si-post.dtsi   |    4 ++
 arch/powerpc/boot/dts/p1020rdb.dtsi           |   13 +++----
 arch/powerpc/boot/dts/p1021mds.dts            |    3 +-
 arch/powerpc/boot/dts/p2020ds.dtsi            |    3 +-
 arch/powerpc/boot/dts/p2020rdb.dts            |    3 +-
 arch/powerpc/kernel/crash.c                   |    2 +-
 arch/powerpc/kernel/legacy_serial.c           |    2 +
 arch/powerpc/platforms/85xx/p1022_ds.c        |    1 +
 arch/powerpc/platforms/powernv/pci-ioda.c     |   43 +++++++++++++++---------
 arch/powerpc/platforms/pseries/Kconfig        |    2 +-
 arch/powerpc/sysdev/fsl_pci.c                 |    5 ++-
 15 files changed, 63 insertions(+), 32 deletions(-)

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

[Benjamin Herrenschmidt]

On Mon, 2012-01-16 at 13:21 -0600, Kumar Gala wrote:
> This doesnt appear to have the compile fix for p1022_ds.c.

I must have pulled it into the wrong branch or something... I'll do a
new one after LCA.

Cheers,
Ben.

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

[Kumar Gala]

On Jan 13, 2012, at 12:21 AM, Benjamin Herrenschmidt wrote:

> Hi Linus !
> 
> Please pull this couple of important bug fixes (a commit
> that went in breaks booting on some machines, this fixes
> it properly).
> 
> Thanks !
> 
> Cheers,
> Ben.
> 
> The following changes since commit 7b3480f8b701170c046e1ed362946f5f0d005e13:
> 
>  Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6 (2012-01-10 13:45:22 -0800)
> 
> are available in the git repository at:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> 
> Anton Blanchard (1):
>      powerpc: Fix RCU idle and hcall tracing
> 
> Li Zhong (1):
>      powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit
> 
> arch/powerpc/kernel/idle.c              |   12 ++----------
> arch/powerpc/platforms/pseries/hvCall.S |    3 ++-
> arch/powerpc/platforms/pseries/lpar.c   |   14 ++++++++++----
> 3 files changed, 14 insertions(+), 15 deletions(-)

Ben,

This doesnt appear to have the compile fix for p1022_ds.c.

- k

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Please pull this couple of important bug fixes (a commit
that went in breaks booting on some machines, this fixes
it properly).

Thanks !

Cheers,
Ben.

The following changes since commit 7b3480f8b701170c046e1ed362946f5f0d005e13:

  Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6 (2012-01-10 13:45:22 -0800)

are available in the git repository at:

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

Anton Blanchard (1):
      powerpc: Fix RCU idle and hcall tracing

Li Zhong (1):
      powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit

 arch/powerpc/kernel/idle.c              |   12 ++----------
 arch/powerpc/platforms/pseries/hvCall.S |    3 ++-
 arch/powerpc/platforms/pseries/lpar.c   |   14 ++++++++++----
 3 files changed, 14 insertions(+), 15 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a handful of tiny fixes for ppc, essentially embedded bits and
all reasonably trivial.

Cheers,
Ben.

The following changes since commit caca6a03d365883564885f2c1da3e88dcf65d139:

  Linux 3.2-rc3 (2011-11-23 20:20:28 -0800)

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

Alexandre Rusev (1):
      powerpc/fsl-lbc: Fix for fsl_upm

Joakim Tjernlund (1):
      powerpc/qe: Fixup QE_General4 errata

Julia Lawall (1):
      arch/powerpc/sysdev/ehv_pic.c: add missing kfree

Kumar Gala (2):
      powerpc/85xx: Fix compile error on p3060_qds.c
      powerpc: Fix compiliation with hugetlbfs enabled

Paul Bolle (1):
      powerpc/p3060qds: Fix select of 'MPC8xxx_GPIO'

Roy Zang (1):
      powerpc/p1023: set IRQ[4:6,11] to active-high level sensitive for PCIe

Shaohui Xie (1):
      drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac

Tony Breeds (1):
      powerpc/44x: Add mtd ndfc to the ppx44x defconfig

 arch/powerpc/boot/dts/p1023rds.dts      |   17 +++++++++++++----
 arch/powerpc/configs/ppc44x_defconfig   |    2 ++
 arch/powerpc/mm/hugetlbpage.c           |    1 +
 arch/powerpc/platforms/85xx/Kconfig     |    2 +-
 arch/powerpc/platforms/85xx/p3060_qds.c |    2 +-
 arch/powerpc/sysdev/ehv_pic.c           |    1 +
 arch/powerpc/sysdev/fsl_lbc.c           |    1 +
 arch/powerpc/sysdev/qe_lib/qe.c         |    2 +-
 drivers/edac/mpc85xx_edac.c             |    2 +-
 9 files changed, 22 insertions(+), 8 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few fixes remaining for powerpc in 3.2. Some tiny build
breakage, a couple of nasty ps3 bugs fixes, other very small and
quite obvious fixes and and a long standing issue with atomics &
ordering for which we have to use stronger barriers than we do to
be correct.

Cheers,
Ben.

The following changes since commit a9098b372606a15745cdeb012de4ee91c0df82c4:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (2011-11-17 15:28:54 -0200)

are available in the git repository at:

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

Al Viro (4):
      powerpc: Fix build breakage in jump_label.c
      carma-fpga: Missed switch from of_register_platform_driver()
      powerpc/fsl_udc_core: Fix dumb typo
      powerpc/fsl: MCU_MPC8349EMITX wants I2C built-in, modular won't do...

Anton Blanchard (2):
      powerpc: panic if we can't instantiate RTAS
      powerpc: Copy down exception vectors after feature fixups

Benjamin Herrenschmidt (1):
      powerpc: Fix atomic_xxx_return barrier semantics

Geoff Levand (2):
      powerpc/ps3: Fix lost SMP IPIs
      powerpc/ps3: Fix SMP lockdep boot warning

Kevin Hao (1):
      powerpc/trace: Add a dummy stack frame for trace_hardirqs_off

Kumar Gala (3):
      powerpc: Revert show_regs() define for readability
      powerpc: Remove extraneous CONFIG_PPC_ADV_DEBUG_REGS define
      powerpc/book3e-64: Fix debug support for userspace

Kyle Moffett (1):
      powerpc: Remove buggy 9-year-old test for binutils < 2.12.1

Michael Neuling (1):
      powerpc: Add hvcall.h include to book3s_hv.c

Suzuki Poulose (1):
      powerpc/4xx: Fix typos in kexec config dependencies

Will Deacon (1):
      powerpc/signal32: Fix sigset_t conversion when copying to user

 arch/powerpc/Kconfig                    |    2 +-
 arch/powerpc/Makefile                   |    6 ---
 arch/powerpc/include/asm/atomic.h       |   48 ++++++++++++------------
 arch/powerpc/include/asm/bitops.h       |   12 +++---
 arch/powerpc/include/asm/futex.h        |    7 ++-
 arch/powerpc/include/asm/reg_booke.h    |    2 +-
 arch/powerpc/include/asm/sections.h     |    2 +-
 arch/powerpc/include/asm/synch.h        |    9 +++-
 arch/powerpc/kernel/entry_32.S          |   15 +++++++
 arch/powerpc/kernel/jump_label.c        |    2 +
 arch/powerpc/kernel/kvm.c               |    1 -
 arch/powerpc/kernel/misc_32.S           |    2 +-
 arch/powerpc/kernel/process.c           |   24 +-----------
 arch/powerpc/kernel/prom_init.c         |    6 +--
 arch/powerpc/kernel/setup_32.c          |    2 +
 arch/powerpc/kernel/setup_64.c          |    1 +
 arch/powerpc/kernel/signal_32.c         |    2 +-
 arch/powerpc/kernel/traps.c             |    2 -
 arch/powerpc/kvm/book3s_hv.c            |    1 +
 arch/powerpc/lib/feature-fixups.c       |   23 +++++++++++
 arch/powerpc/platforms/Kconfig          |    2 +-
 arch/powerpc/platforms/ps3/interrupt.c  |   23 +++++++++++-
 arch/powerpc/platforms/ps3/platform.h   |    1 +
 arch/powerpc/platforms/ps3/smp.c        |   62 ++++++++++++++++---------------
 drivers/misc/carma/carma-fpga-program.c |    9 ++--
 drivers/misc/carma/carma-fpga.c         |    9 ++--
 drivers/usb/gadget/fsl_udc_core.c       |    2 +-
 27 files changed, 158 insertions(+), 119 deletions(-)

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

[Benjamin Herrenschmidt]

On Tue, 2011-11-08 at 15:21 +1100, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> Me again :-) So yesterday you pulled my -next branch with the bulk of
> what happened since the last merge window up to when I left for my long
> vacation (5 weeks). Today are a few remaining nits that happened during
> that time.

 .. Add added a build fix (the defconfig change enables KVM which hits a
compile problem with some config combinations) so new pull request
bellow. Sorry about that.

Cheers,
Ben.

The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:

  Linux 3.2-rc1 (2011-11-07 16:16:02 -0800)

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

Alexander Graf (1):
      powerpc/kvm: Fix build failure with HV KVM and CBE

Anton Blanchard (1):
      powerpc: Add System RAM to /proc/iomem

Benjamin Herrenschmidt (1):
      Merge remote-tracking branch 'agust/next' into merge

Dipankar Sarma (1):
      powerpc/numa: NUMA topology support for PowerNV

Geoff Levand (2):
      powerpc/ps3: Fix PS3 repository build warnings
      powerpc/ps3: Fix lv1_gpu_attribute hcall

Heiko Schocher (2):
      powerpc/5200: add support for charon board
      powerpc, tqm5200: update tqm5200_defconfig to fit for charon board.

Michael Neuling (1):
      powerpc: Add KVM as module to defconfigs

Nishanth Aravamudan (1):
      powerpc/kvm: Fix build with older toolchains

Yong Zhang (2):
      powerpc/irq: Remove IRQF_DISABLED
      powerpc/ps3: irq: Remove IRQF_DISABLED

 arch/powerpc/boot/dts/charon.dts               |  236 ++++++++++++++++++++++++
 arch/powerpc/configs/52xx/tqm5200_defconfig    |   20 ++-
 arch/powerpc/configs/ppc64_defconfig           |    4 +
 arch/powerpc/configs/pseries_defconfig         |    4 +
 arch/powerpc/include/asm/floppy.h              |    4 +-
 arch/powerpc/include/asm/lv1call.h             |    2 +-
 arch/powerpc/include/asm/xics.h                |    4 +-
 arch/powerpc/kernel/exceptions-64s.S           |    6 +-
 arch/powerpc/kernel/smp.c                      |    2 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S        |    2 +-
 arch/powerpc/mm/mem.c                          |   30 +++
 arch/powerpc/mm/numa.c                         |   24 ++-
 arch/powerpc/platforms/52xx/mpc5200_simple.c   |    1 +
 arch/powerpc/platforms/cell/beat.c             |    2 +-
 arch/powerpc/platforms/cell/celleb_scc_pciex.c |    2 +-
 arch/powerpc/platforms/cell/iommu.c            |    3 +-
 arch/powerpc/platforms/cell/pmu.c              |    2 +-
 arch/powerpc/platforms/cell/spu_base.c         |    9 +-
 arch/powerpc/platforms/powermac/pic.c          |    1 -
 arch/powerpc/platforms/powermac/smp.c          |    4 +-
 arch/powerpc/platforms/ps3/device-init.c       |    2 +-
 arch/powerpc/platforms/ps3/repository.c        |   32 ++--
 arch/powerpc/sysdev/mpic.c                     |    2 -
 arch/powerpc/sysdev/ppc4xx_soc.c               |    2 +-
 arch/powerpc/sysdev/xics/xics-common.c         |    5 +-
 drivers/ps3/ps3-vuart.c                        |    2 +-
 drivers/ps3/ps3stor_lib.c                      |    2 +-
 sound/ppc/snd_ps3.c                            |    2 +-
 28 files changed, 346 insertions(+), 65 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/charon.dts

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Me again :-) So yesterday you pulled my -next branch with the bulk of
what happened since the last merge window up to when I left for my long
vacation (5 weeks). Today are a few remaining nits that happened during
that time.

Essentially small fixes, a defconfig bit, some janitorial stuff
(IRQ_DISABLED removal), a board support for 52xx that I forgot to pull
from Anatolij, and a fix to properly parse NUMA info from the
device-tree on powernc.

Ah, also finally add main memory to /proc/iomem. I've resisted that for
a long time but too much userspace gunk relies on it so here we go.

Cheers,
Ben.

The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:

  Linux 3.2-rc1 (2011-11-07 16:16:02 -0800)

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

Anton Blanchard (1):
      powerpc: Add System RAM to /proc/iomem

Benjamin Herrenschmidt (1):
      Merge remote-tracking branch 'agust/next' into merge

Dipankar Sarma (1):
      powerpc/numa: NUMA topology support for PowerNV

Geoff Levand (2):
      powerpc/ps3: Fix PS3 repository build warnings
      powerpc/ps3: Fix lv1_gpu_attribute hcall

Heiko Schocher (2):
      powerpc/5200: add support for charon board
      powerpc, tqm5200: update tqm5200_defconfig to fit for charon board.

Michael Neuling (1):
      powerpc: Add KVM as module to defconfigs

Nishanth Aravamudan (1):
      powerpc/kvm: Fix build with older toolchains

Yong Zhang (2):
      powerpc/irq: Remove IRQF_DISABLED
      powerpc/ps3: irq: Remove IRQF_DISABLED

 arch/powerpc/boot/dts/charon.dts               |  236 ++++++++++++++++++++++++
 arch/powerpc/configs/52xx/tqm5200_defconfig    |   20 ++-
 arch/powerpc/configs/ppc64_defconfig           |    4 +
 arch/powerpc/configs/pseries_defconfig         |    4 +
 arch/powerpc/include/asm/floppy.h              |    4 +-
 arch/powerpc/include/asm/lv1call.h             |    2 +-
 arch/powerpc/include/asm/xics.h                |    4 +-
 arch/powerpc/kernel/smp.c                      |    2 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S        |    2 +-
 arch/powerpc/mm/mem.c                          |   30 +++
 arch/powerpc/mm/numa.c                         |   24 ++-
 arch/powerpc/platforms/52xx/mpc5200_simple.c   |    1 +
 arch/powerpc/platforms/cell/beat.c             |    2 +-
 arch/powerpc/platforms/cell/celleb_scc_pciex.c |    2 +-
 arch/powerpc/platforms/cell/iommu.c            |    3 +-
 arch/powerpc/platforms/cell/pmu.c              |    2 +-
 arch/powerpc/platforms/cell/spu_base.c         |    9 +-
 arch/powerpc/platforms/powermac/pic.c          |    1 -
 arch/powerpc/platforms/powermac/smp.c          |    4 +-
 arch/powerpc/platforms/ps3/device-init.c       |    2 +-
 arch/powerpc/platforms/ps3/repository.c        |   32 ++--
 arch/powerpc/sysdev/mpic.c                     |    2 -
 arch/powerpc/sysdev/ppc4xx_soc.c               |    2 +-
 arch/powerpc/sysdev/xics/xics-common.c         |    5 +-
 drivers/ps3/ps3-vuart.c                        |    2 +-
 drivers/ps3/ps3stor_lib.c                      |    2 +-
 sound/ppc/snd_ps3.c                            |    2 +-
 27 files changed, 343 insertions(+), 62 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/charon.dts

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some minor defconfig updates and a device tree fix from
Kumar for 3.1.

Cheers,
Ben.

The following changes since commit c6a389f123b9f68d605bb7e0f9b32ec1e3e14132:

  Linux 3.1-rc4 (2011-08-28 21:16:01 -0700)

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

Chunhe Lan (1):
      powerpc/p1023rds: Fix the error of bank-width of nor flash

Kim Phillips (1):
      powerpc/85xx: enable caam crypto driver by default

Timur Tabi (1):
      powerpc/85xx: enable the audio drivers in the defconfigs

 arch/powerpc/boot/dts/p1023rds.dts           |    2 +-
 arch/powerpc/configs/85xx/p1023rds_defconfig |    1 +
 arch/powerpc/configs/corenet32_smp_defconfig |    1 +
 arch/powerpc/configs/corenet64_smp_defconfig |    5 ++++-
 arch/powerpc/configs/mpc85xx_defconfig       |    1 +
 arch/powerpc/configs/mpc85xx_smp_defconfig   |    1 +
 6 files changed, 9 insertions(+), 2 deletions(-)

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

[Benjamin Herrenschmidt]

On Wed, 2011-08-10 at 11:07 -0700, Linus Torvalds wrote:
> On Wed, Aug 10, 2011 at 8:27 AM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
> >
> > Here are a few fixes for powerpc. Mostly innocuous stuff, in fact most of
> > it has been in my tree for a while, I just hadn't got a chance to actually
> > send it as I was travelling.
> >
> > Cheers,
> > Ben.
> >
> > The following changes since commit 53d1e658df6e26d62500410719aaee2b82067c03:
> >
> >  Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-08-04 06:37:07 -1000)
> >
> > are available in the git repository at:
> >
> >  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED..
> 
> What branch?

Heh oops, sorry, the mirror hadn't caught up. It's in the subject of the
email tho :-) "merge" is the branch.

Cheers,
Ben.

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

[Linus Torvalds]

On Wed, Aug 10, 2011 at 8:27 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> Here are a few fixes for powerpc. Mostly innocuous stuff, in fact most of
> it has been in my tree for a while, I just hadn't got a chance to actually
> send it as I was travelling.
>
> Cheers,
> Ben.
>
> The following changes since commit 53d1e658df6e26d62500410719aaee2b82067c03:
>
>  Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-08-04 06:37:07 -1000)
>
> are available in the git repository at:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED..

What branch?

                        Linus

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few fixes for powerpc. Mostly innocuous stuff, in fact most of
it has been in my tree for a while, I just hadn't got a chance to actually
send it as I was travelling.

Cheers,
Ben.

The following changes since commit 53d1e658df6e26d62500410719aaee2b82067c03:

  Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-08-04 06:37:07 -1000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED..

Anatolij Gustschin (1):
      MAINTAINERS: change maintainership of mpc5xxx

Anton Blanchard (10):
      powerpc: Fix device tree claim code
      powerpc: Clean up some panic messages in prom_init
      powerpc: Jump label misalignment causes oops at boot
      powerpc: pseries: Fix kexec on machines with more than 4TB of RAM
      powerpc: Move kdump default base address to half RMO size on 64bit
      powerpc: Lack of ibm,io-events not that important!
      powerpc: Make KVM_GUEST default to n
      powerpc/pseries: Fix kexec on recent firmware versions
      powerpc/pseries: Cleanup VPA registration and deregistration errors
      powerpc/pseries: Simplify vpa deregistration functions

Benjamin Herrenschmidt (3):
      powerpc/4xx: Fix build of PCI code on 405
      powerpc: Fix build without CONFIG_PCI
      powerpc: Really fix build without CONFIG_PCI

David Ahern (1):
      powerpc/perf: Disable pagefaults during callchain stack read

Nishanth Aravamudan (1):
      powerpc/kvm: Fix build errors with older toolchains

Peter Zijlstra (1):
      ppc: Remove duplicate definition of PV_POWER7

Scott Wood (2):
      powerpc: mtspr/mtmsr should take an unsigned long
      powerpc: Return the_cpu_ spec from identify_cpu

 MAINTAINERS                                     |    4 +-
 arch/powerpc/include/asm/jump_label.h           |    2 -
 arch/powerpc/include/asm/kdump.h                |   10 -------
 arch/powerpc/include/asm/reg.h                  |    8 +++--
 arch/powerpc/kernel/cputable.c                  |   11 ++++---
 arch/powerpc/kernel/iomap.c                     |    2 +
 arch/powerpc/kernel/machine_kexec.c             |   10 +++++--
 arch/powerpc/kernel/perf_callchain.c            |   20 +++++++++++--
 arch/powerpc/kernel/prom_init.c                 |   14 +++++----
 arch/powerpc/kvm/book3s_hv_rmhandlers.S         |    4 +-
 arch/powerpc/platforms/Kconfig                  |    2 +-
 arch/powerpc/platforms/pseries/dtl.c            |    2 +-
 arch/powerpc/platforms/pseries/hotplug-cpu.c    |    4 +-
 arch/powerpc/platforms/pseries/io_event_irq.c   |    8 ++---
 arch/powerpc/platforms/pseries/kexec.c          |   34 +++++++++++++++--------
 arch/powerpc/platforms/pseries/lpar.c           |   19 ++++++-------
 arch/powerpc/platforms/pseries/plpar_wrappers.h |   12 ++++----
 arch/powerpc/platforms/pseries/setup.c          |    5 ++-
 arch/powerpc/sysdev/ppc4xx_pci.c                |    5 ++-
 19 files changed, 99 insertions(+), 77 deletions(-)
 

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

I almost forgot to send you these two patches I had around for some time
now. They fix a nasty warning at boot (and possibly more) when booting a
kernel with CONFIG_PPC_PSERIES enabled on a non-pseries machine.

The first patch just moves a duplicate #define to a common header file,
the second patch is the actual fix.

Cheers,
Ben.

The following changes since commit 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc:

  Linux 3.0-rc7 (2011-07-11 16:51:52 -0700)

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

Benjamin Herrenschmidt (2):
      mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header
      powerpc/mm: Fix memory_block_size_bytes() for non-pseries

 arch/powerpc/platforms/pseries/hotplug-memory.c |   30 ++++++++++++++--------
 arch/x86/mm/init_64.c                           |    3 +-
 drivers/base/memory.c                           |    1 -
 include/linux/memory.h                          |    2 +
 4 files changed, 22 insertions(+), 14 deletions(-)
 

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a handful of minor powerpc bits for 3.0

Note: At the time of this sending, the mirrors still hadn't caught up.

Cheers,
Ben.


The following changes since commit b0af8dfdd67699e25083478c63eedef2e72ebd85:

  Linux 3.0-rc5 (2011-06-27 19:12:22 -0700)

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

Christian Dietrich (2):
      powerpc/rtas-rtc: remove sideeffects of printk_ratelimit
      arch/powerpc: use printk_ratelimited instead of printk_ratelimit

Michael Neuling (1):
      powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig

Scott Wood (1):
      powerpc/e500: fix breakage with fsl_rio_mcheck_exception

Shaohui Xie (1):
      powerpc/85xx: fix NAND_CMD_READID read bytes number

Timur Tabi (1):
      powerpc/p1022ds: fix audio-related properties in the device tree

 arch/powerpc/boot/dts/p1022ds.dts      |    9 +++--
 arch/powerpc/configs/pseries_defconfig |    1 -
 arch/powerpc/kernel/rtas-rtc.c         |   29 +++++++++-------
 arch/powerpc/kernel/signal_32.c        |   57 +++++++++++++++++--------------
 arch/powerpc/kernel/signal_64.c        |   17 +++++----
 arch/powerpc/kernel/traps.c            |   24 ++++++-------
 arch/powerpc/mm/fault.c                |   10 +++---
 arch/powerpc/sysdev/fsl_rio.c          |   33 +++++++++---------
 arch/powerpc/sysdev/mpic.c             |   11 +++---
 drivers/mtd/nand/fsl_elbc_nand.c       |    6 ++--
 10 files changed, 104 insertions(+), 93 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a small batch of fixes for powerpc.

Just one note: I just noticed a mistake while fixing a bug in "powerpc:
Force page alignment for initrd reserved memory". Bloody "citool"
changed the authorchip to me. The real author is Dave Carroll
<dcarroll@astekcorp.com>. (it's a nasty mis-feature of ci-tool that
overrides the author when doing an amend of an existing commit).

I didn't want to rebase the branch for that tho.

Cheers,
Ben.

The following changes since commit 06e86849cf4019945a106913adb9ff0abcc01770:

  Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 (2011-06-08 15:58:51 -0700)

are available in the git repository at:

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

Benjamin Herrenschmidt (1): (Dave Carroll really)
      powerpc: Force page alignment for initrd reserved memory

Kumar Gala (2):
      powerpc/fsl_rio: Fix compile error when CONFIG_FSL_RIO not set
      powerpc/book3e: Fix CPU feature handling on e5500 in 32-bit mode

Shaohui Xie (1):
      powerpc/85xx: fix race bug of calling request_irq after enable elbc interrupts

Wolfram Sang (1):
      dtc/powerpc: remove obsolete .gitignore entries

 arch/powerpc/boot/.gitignore         |    1 -
 arch/powerpc/boot/dtc-src/.gitignore |    3 ---
 arch/powerpc/include/asm/rio.h       |    2 +-
 arch/powerpc/kernel/cputable.c       |    2 +-
 arch/powerpc/kernel/prom.c           |   27 ++++++++++++++++++++++++---
 arch/powerpc/mm/init_32.c            |   15 ---------------
 arch/powerpc/mm/init_64.c            |   14 --------------
 arch/powerpc/mm/mem.c                |   19 +++++++++++++++++++
 arch/powerpc/sysdev/fsl_lbc.c        |    6 +++---
 9 files changed, 48 insertions(+), 41 deletions(-)
 delete mode 100644 arch/powerpc/boot/dtc-src/.gitignore

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

[Kumar Gala]

On May 27, 2011, at 1:55 AM, Benjamin Herrenschmidt wrote:

> Hi Linus !
> 
> Here's the 3 patches Kumar was complaining I forgot to pull :-)
> 
> Two are pretty old patches related to FSL RapidIO stuff, and
> one is a bug fix.
> 
> Cheers,
> Ben.

Thanks.  I know I'm a pain ;)

- k

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's the 3 patches Kumar was complaining I forgot to pull :-)

Two are pretty old patches related to FSL RapidIO stuff, and
one is a bug fix.

Cheers,
Ben.

The following changes since commit dc7acbb2518f250050179c8581a972df3b6a24f1:

  Merge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen (2011-05-26 19:01:15 -0700)

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      Merge remote branch 'kumar/merge' into merge

Shaohui Xie (2):
      powerpc/fsl_rio: move machine_check handler
      powerpc/fsl_rio: Error interrupt handler for sRIO on MPC85xx

Shengzhou Liu (1):
      powerpc/fsl_lbc: Add workaround for ELBC-A001 erratum

 arch/powerpc/include/asm/fsl_lbc.h |    2 +
 arch/powerpc/include/asm/rio.h     |    5 ++
 arch/powerpc/kernel/traps.c        |   13 +++++
 arch/powerpc/sysdev/fsl_lbc.c      |    9 +++-
 arch/powerpc/sysdev/fsl_rio.c      |  100 ++++++++++++++++++++++++++++-------
 5 files changed, 107 insertions(+), 22 deletions(-)

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

[Benjamin Herrenschmidt]

On Thu, 2011-05-26 at 09:02 -0500, Kumar Gala wrote:
> Ben,
> 
> Did you ignore my pull request with a bug fix and two long standing
> RIO patches?

I suppose I did ... oops :-)

I'll send that today.

Cheers,
Ben.

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

[Kumar Gala]

On May 26, 2011, at 12:22 AM, Benjamin Herrenschmidt wrote:

> Hi Linus !
> 
> This is a bit more than I expected to send you that late in the merge
> window, but hopefully none of it should be problematic. A couple of
> patches were simply delayed due to misunderstandings as to which tree
> they should go through (4xx MSI and ftrace).
> 
> There's a generic patch to linux/smp.h which removes some definitions
> that as far as we can tell aren't used anywhere anymore (we just removed
> the last use in powerpc in my previous pull request).
> 
> The rest is either good enough bug fixes (in large part regressions),
> with a couple more cleanups from Milton on top of his big series that
> I merged earlier.
> 
> Cheers,
> Ben.
> 
> The following changes since commit 3f5785ec31adcb7cafa9135087297a38d9698cf8:
> 
>  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2011-05-25 17:00:17 -0700)
> 
> are available in the git repository at:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED..
> 
> Brian King (1):
>      powerpc/pseries: Update MAX_HCALL_OPCODE to reflect page coalescing
> 
> Eric B Munson (1):
>      powerpc/oprofile: Handle events that raise an exception without overflowing
> 
> Ian Munsie (1):
>      powerpc/ftrace: Implement raw syscall tracepoints on PowerPC
> 
> Milton Miller (8):
>      Remove unused MSG_ flags in linux/smp.h
>      powerpc/cell: Use common smp ipi actions
>      powerpc/cell: Rename ipi functions to match current abstractions
>      powerpc/irq: Remove stale and misleading comment
>      powerpc/irq: Always free duplicate IRQ_LEGACY hosts
>      powerpc/irq: Check desc in handle_one_irq and expand generic_handle_irq
>      powerpc/irq: Protect irq_radix_revmap_lookup against irq_free_virt
>      powerpc: Fix irq_free_virt by adjusting bounds before loop
> 
> Rupjyoti Sarmah (1):
>      powerpc/4xx: Adding PCIe MSI support

Ben,

Did you ignore my pull request with a bug fix and two long standing RIO patches?

- k

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This is a bit more than I expected to send you that late in the merge
window, but hopefully none of it should be problematic. A couple of
patches were simply delayed due to misunderstandings as to which tree
they should go through (4xx MSI and ftrace).

There's a generic patch to linux/smp.h which removes some definitions
that as far as we can tell aren't used anywhere anymore (we just removed
the last use in powerpc in my previous pull request).

The rest is either good enough bug fixes (in large part regressions),
with a couple more cleanups from Milton on top of his big series that
I merged earlier.

Cheers,
Ben.

The following changes since commit 3f5785ec31adcb7cafa9135087297a38d9698cf8:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2011-05-25 17:00:17 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED..

Brian King (1):
      powerpc/pseries: Update MAX_HCALL_OPCODE to reflect page coalescing

Eric B Munson (1):
      powerpc/oprofile: Handle events that raise an exception without overflowing

Ian Munsie (1):
      powerpc/ftrace: Implement raw syscall tracepoints on PowerPC

Milton Miller (8):
      Remove unused MSG_ flags in linux/smp.h
      powerpc/cell: Use common smp ipi actions
      powerpc/cell: Rename ipi functions to match current abstractions
      powerpc/irq: Remove stale and misleading comment
      powerpc/irq: Always free duplicate IRQ_LEGACY hosts
      powerpc/irq: Check desc in handle_one_irq and expand generic_handle_irq
      powerpc/irq: Protect irq_radix_revmap_lookup against irq_free_virt
      powerpc: Fix irq_free_virt by adjusting bounds before loop

Rupjyoti Sarmah (1):
      powerpc/4xx: Adding PCIe MSI support

 arch/powerpc/Kconfig                    |    1 +
 arch/powerpc/boot/dts/canyonlands.dts   |   18 ++
 arch/powerpc/boot/dts/katmai.dts        |   18 ++
 arch/powerpc/boot/dts/kilauea.dts       |   28 +++
 arch/powerpc/boot/dts/redwood.dts       |   20 +++
 arch/powerpc/include/asm/ftrace.h       |   14 ++
 arch/powerpc/include/asm/hvcall.h       |    2 +-
 arch/powerpc/include/asm/smp.h          |    2 -
 arch/powerpc/include/asm/syscall.h      |    5 +
 arch/powerpc/include/asm/thread_info.h  |    7 +-
 arch/powerpc/kernel/Makefile            |    1 +
 arch/powerpc/kernel/ftrace.c            |    8 +
 arch/powerpc/kernel/irq.c               |   46 +++---
 arch/powerpc/kernel/ptrace.c            |   10 +
 arch/powerpc/kernel/smp.c               |    2 +-
 arch/powerpc/oprofile/op_model_power4.c |   24 +++-
 arch/powerpc/platforms/40x/Kconfig      |    2 +
 arch/powerpc/platforms/44x/Kconfig      |    6 +
 arch/powerpc/platforms/cell/interrupt.c |   55 ++----
 arch/powerpc/platforms/cell/interrupt.h |    2 +-
 arch/powerpc/platforms/cell/smp.c       |    2 +-
 arch/powerpc/sysdev/Kconfig             |    7 +
 arch/powerpc/sysdev/Makefile            |    1 +
 arch/powerpc/sysdev/ppc4xx_msi.c        |  276 +++++++++++++++++++++++++++++++
 include/linux/smp.h                     |   10 -
 25 files changed, 491 insertions(+), 76 deletions(-)
 create mode 100644 arch/powerpc/sysdev/ppc4xx_msi.c

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

[Benjamin Herrenschmidt]

On Fri, 2011-05-20 at 15:23 +0200, Richard Cochran wrote:
> On Thu, May 19, 2011 at 02:06:18PM +1000, Benjamin Herrenschmidt wrote:
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> 
> When I try to build 'next' (now at 208b3a4c), it does not compile due
> to a change from the following commit.
> 
> > Benjamin Herrenschmidt (1):
> >       powerpc/smp: Make start_secondary_resume available to all CPU variants
> 
> I would appreciate your help in getting this fixed...

It's me being a moron. I'll send a fix to Linus.

Cheers,
Ben.

> Thanks,
> Richard
> 
> PS the error looks like this:
> 
>   AS      arch/powerpc/kernel/misc_32.o
> arch/powerpc/kernel/misc_32.S: Assembler messages:
> arch/powerpc/kernel/misc_32.S:703: Error: Unrecognized opcode: `std'
> make[2]: *** [arch/powerpc/kernel/misc_32.o] Error 1
> make[1]: *** [arch/powerpc/kernel] Error 2
> 
> > ${CROSS_COMPILE}gcc -v
> Using built-in specs.
> Target: powerpc-none-linux-gnuspe
> Configured with: ../gcc-4.3.2/configure --target=powerpc-none-linux-gnuspe --host=i686-pc-linux-gnu --prefix=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe --with-sysroot=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe/powerpc-none-linux-gnuspe/libc --disable-libssp --disable-libmudflap --disable-libstdcxx-pch --enable-libgomp --enable-shared --enable-threads --enable-languages=c,c++ --with-gmp=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-mpfr=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-cpu=8548 --with-gnu-as --with-gnu-ld --enable-symvers=gnu --enable-__cxa_atexit --enable-cxx-flags=-mcpu=8548 --disable-multilib --with-long-double-128 --disable-nls --enable-e500_double
> Thread model: posix
> gcc version 4.3.2 (GCC) 

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

[Kumar Gala]

On May 20, 2011, at 9:46 AM, Josh Boyer wrote:

> On Fri, May 20, 2011 at 04:32:59PM +0200, Richard Cochran wrote:
>> On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote:
>>> On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote:
>>>> When I try to build 'next' (now at 208b3a4c), it does not compile due
>>>> to a change from the following commit.
>>>> 
>>>>> Benjamin Herrenschmidt (1):
>>>>>      powerpc/smp: Make start_secondary_resume available to all CPU variants
>>>> 
>>>> I would appreciate your help in getting this fixed...
>>> 
>>> Could you try the patch below?
>> 
>> Yes, and it both compiles and boots.
> 
> Thanks for testing!
> 
> Ben, can you pull this patch in as-is (fixing up the Subject), or do you
> need me to resubmit it?


Yeah, we need this all so we can send it to stable for 2.6.39.1

- k

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

[Josh Boyer]

On Fri, May 20, 2011 at 04:32:59PM +0200, Richard Cochran wrote:
>On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote:
>> On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote:
>> >When I try to build 'next' (now at 208b3a4c), it does not compile due
>> >to a change from the following commit.
>> >
>> >> Benjamin Herrenschmidt (1):
>> >>       powerpc/smp: Make start_secondary_resume available to all CPU variants
>> >
>> >I would appreciate your help in getting this fixed...
>> 
>> Could you try the patch below?
>
>Yes, and it both compiles and boots.

Thanks for testing!

Ben, can you pull this patch in as-is (fixing up the Subject), or do you
need me to resubmit it?

josh
>> 
>> Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S,
>> however it uses a 64-bit instruction which is not valid on 32-bit
>> platforms.  Use 'stw' instead.
>> 
>> Reported-by: Richard Cochran <richardcochran@gmail.com>
>> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
>> 
>> ---
>> 
>> diff --git a/arch/powerpc/kernel/misc_32.S
>> b/arch/powerpc/kernel/misc_32.S
>> index 402560e..998a100 100644
>> --- a/arch/powerpc/kernel/misc_32.S
>> +++ b/arch/powerpc/kernel/misc_32.S
>> @@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume)
>> 	rlwinm  r1,r1,0,0,(31-THREAD_SHIFT)     /* current_thread_info() */
>> 	addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
>> 	li      r3,0
>> -	std     r3,0(r1)                /* Zero the stack frame pointer */
>> +	stw     r3,0(r1)                /* Zero the stack frame pointer */
>> 	bl      start_secondary
>> 	b       .
>>  #endif /* CONFIG_SMP */
>> 

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

[Richard Cochran]

On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote:
> On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote:
> >When I try to build 'next' (now at 208b3a4c), it does not compile due
> >to a change from the following commit.
> >
> >> Benjamin Herrenschmidt (1):
> >>       powerpc/smp: Make start_secondary_resume available to all CPU variants
> >
> >I would appreciate your help in getting this fixed...
> 
> Could you try the patch below?

Yes, and it both compiles and boots.

Thanks,
Richard

> 
> Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S,
> however it uses a 64-bit instruction which is not valid on 32-bit
> platforms.  Use 'stw' instead.
> 
> Reported-by: Richard Cochran <richardcochran@gmail.com>
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> 
> ---
> 
> diff --git a/arch/powerpc/kernel/misc_32.S
> b/arch/powerpc/kernel/misc_32.S
> index 402560e..998a100 100644
> --- a/arch/powerpc/kernel/misc_32.S
> +++ b/arch/powerpc/kernel/misc_32.S
> @@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume)
> 	rlwinm  r1,r1,0,0,(31-THREAD_SHIFT)     /* current_thread_info() */
> 	addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
> 	li      r3,0
> -	std     r3,0(r1)                /* Zero the stack frame pointer */
> +	stw     r3,0(r1)                /* Zero the stack frame pointer */
> 	bl      start_secondary
> 	b       .
>  #endif /* CONFIG_SMP */
> 

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

[Josh Boyer]

On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote:
>When I try to build 'next' (now at 208b3a4c), it does not compile due
>to a change from the following commit.
>
>> Benjamin Herrenschmidt (1):
>>       powerpc/smp: Make start_secondary_resume available to all CPU variants
>
>I would appreciate your help in getting this fixed...

Could you try the patch below?

Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S,
however it uses a 64-bit instruction which is not valid on 32-bit
platforms.  Use 'stw' instead.

Reported-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

---

diff --git a/arch/powerpc/kernel/misc_32.S
b/arch/powerpc/kernel/misc_32.S
index 402560e..998a100 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume)
	rlwinm  r1,r1,0,0,(31-THREAD_SHIFT)     /* current_thread_info() */
	addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
	li      r3,0
-	std     r3,0(r1)                /* Zero the stack frame pointer */
+	stw     r3,0(r1)                /* Zero the stack frame pointer */
	bl      start_secondary
	b       .
 #endif /* CONFIG_SMP */

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

[Richard Cochran]

On Thu, May 19, 2011 at 02:06:18PM +1000, Benjamin Herrenschmidt wrote:
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

When I try to build 'next' (now at 208b3a4c), it does not compile due
to a change from the following commit.

> Benjamin Herrenschmidt (1):
>       powerpc/smp: Make start_secondary_resume available to all CPU variants

I would appreciate your help in getting this fixed...

Thanks,
Richard

PS the error looks like this:

  AS      arch/powerpc/kernel/misc_32.o
arch/powerpc/kernel/misc_32.S: Assembler messages:
arch/powerpc/kernel/misc_32.S:703: Error: Unrecognized opcode: `std'
make[2]: *** [arch/powerpc/kernel/misc_32.o] Error 1
make[1]: *** [arch/powerpc/kernel] Error 2

> ${CROSS_COMPILE}gcc -v
Using built-in specs.
Target: powerpc-none-linux-gnuspe
Configured with: ../gcc-4.3.2/configure --target=powerpc-none-linux-gnuspe --host=i686-pc-linux-gnu --prefix=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe --with-sysroot=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe/powerpc-none-linux-gnuspe/libc --disable-libssp --disable-libmudflap --disable-libstdcxx-pch --enable-libgomp --enable-shared --enable-threads --enable-languages=c,c++ --with-gmp=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-mpfr=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-cpu=8548 --with-gnu-as --with-gnu-ld --enable-symvers=gnu --enable-__cxa_atexit --enable-cxx-flags=-mcpu=8548 --disable-multilib --with-long-double-128 --disable-nls --enable-e500_double
Thread model: posix
gcc version 4.3.2 (GCC) 

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus

Here's the bulk of powerpc changes for this merge window. 

Some of the highlights are:

 - Basic support for the new PowerEN processor (Power Edge of Network, I
didn't come up with that name), and known in the linux code by one of
it's former code names "wsp" (aka Wirespeed Processor). This adds among
other support for the A2i core contained in that SoC which is an
embedded multithreaded 64-bit core with an in-order pipeline using the
"embedded" variant of the PowerPC architecture.

 - Some work for running on Power7 without an underlying hypervisor
(running in hypervisor mode), which will enable the KVM code that Paulus
and Alex are getting ready for the next merge window

 - A whole pile of cleanups and bugs fixes mostly to our interrupt
handling from Milton, which should make Thomas and Grant life easier in
moving some of the irq domain facility to generic code

And the usual pile of small bits & pieces, fixes, new boards, etc...

I have done a manual merge with your tree today to fixup a non-trivial
clash with Peter's scheduler_ipi() changes (the obvious fixup would have
missed a couple of places where that call needs to be added) and I've
added a pair of fixes on top of it to work around immediate breakage I
found after testing the result.

Note: At the time of sending this, it hadn't hit the mirrors yet.

Cheers,
Ben. 

The following changes since commit 39ab05c8e0b519ff0a04a869f065746e6e8c3d95:

  Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 (2011-05-19 18:24:11 -0700)

are available in the git repository at:

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

Alexey Kardashevskiy (1):
      powerpc: Per process DSCR + some fixes (try#4)

Anton Blanchard (10):
      powerpc: Replace open coded instruction patching with patch_instruction/patch_branch
      powerpc/rtas: Only sleep in rtas_busy_delay if we have useful work to do
      powerpc/pseries: Enable Emulex and Qlogic 10Gbit cards
      powerpc/pseries: Enable iSCSI support for a number of cards
      powerpc: Simplify 4k/64k copy_page logic
      powerpc: Remove static branch hint in giveup_altivec
      powerpc: Improve scheduling of system call entry instructions
      powerpc: Add ioremap_wc
      powerpc: Remove ioremap_flags
      powerpc/pseries: Print corrupt r3 in FWNMI code

Ben Hutchings (2):
      powerpc/kexec: Fix build failure on 32-bit SMP
      powerpc/kexec: Fix build failure on 32-bit SMP

Benjamin Herrenschmidt (29):
      powerpc/xics: Rewrite XICS driver
      powerpc: Add more Power7 specific definitions
      powerpc/xics: Make sure we have a sensible default distribution server
      powerpc: Define CPU feature for Architected 2.06 HV mode
      powerpc: In HV mode, use HSPRG0 for PACA
      powerpc: Base support for exceptions using HSRR0/1
      powerpc: More work to support HV exceptions
      powerpc: Initialize LPCR:DPFD on power7 to a sane default
      powerpc: Initialize TLB and LPID register on HV mode Power7
      powerpc: Call CPU ->restore callback earlier on secondary CPUs
      powerpc: Properly handshake CPUs going out of boot spin loop
      powerpc: Add NAP mode support on Power7 in HV mode
      powerpc: Perform an isync to synchronize CPUs coming out of secondary_hold
      powerpc: Improve prom_printf()
      powerpc/a2: Add some #defines for A2 specific instructions
      powerpc: Add SCOM infrastructure
      powerpc/nvram: Search for nvram using compatible
      powerpc: Add A2 cpu support
      powerpc: Add TLB size detection for TYPE_3E MMUs
      powerpc/book3e: Use way 3 for linear mapping bolted entry
      powerpc: Rename slb0_limit() to safe_stack_limit() and add Book3E support
      powerpc/smp: Make start_secondary_resume available to all CPU variants
      powerpc: Remove unused/obsolete CONFIG_XICS
      Merge branch 'merge' into next
      powerpc: Make early memory scan more resilient to out of order nodes
      Merge remote branch 'kumar/next' into next
      Merge remote branch 'origin/master' into merge
      powerpc/pmac: Update via-pmu to new syscore_ops
      powerpc: Fix hard CPU IDs detection

Bhaskar Upadhaya (1):
      powerpc: Adding bindings for flexcan controller

Brian King (1):
      powerpc/pseries: Add page coalescing support

David Gibson (2):
      powerpc/boot: Add an ePAPR compliant boot wrapper
      powerpc: Add WSP platform

Dipen Dudhat (1):
      powerpc: Integrated Flash controller device tree bindings

Gabriel Paubert (1):
      powerpc: Fix for Pegasos keyboard and mouse

Geert Uytterhoeven (2):
      powerpc/ps3: Update debug message for irq_set_chip_data()
      powerpc/mpc8610_hpcd: Do not use "/" in interrupt names

Grant Likely (1):
      powerpc/irq: Stop exporting irq_map

Ira Snyder (2):
      misc: Add CARMA DATA-FPGA Access Driver
      misc: Add CARMA DATA-FPGA Programmer support

Jack Miller (2):
      powerpc/book3e: Flush IPROT protected TLB entries leftover by firmware
      powerpc: Add early debug for WSP platforms

Justin Mattock (1):
      powerpc: Remove unused config in the Makefile

KOSAKI Motohiro (1):
      powerpc: Convert old cpumask API into new one

Kumar Gala (2):
      Merge remote branch 'benh/merge' into benh-next
      powerpc/fsl-booke64: Add support for Debug Level exception handler

Matt Evans (1):
      powerpc: Free up some CPU feature bits by moving out MMU-related features

Michael Ellerman (19):
      powerpc/mm: Standardise on MMU_NO_CONTEXT
      powerpc/mm: Fix slice state initialization for Book3E
      powerpc/boot: Allow building the zImage wrapper as a relocatable ET_DYN
      powerpc/smp: smp_ops->kick_cpu() should be able to fail
      powerpc/nohash: Allocate stale_map[cpu] on CPU_UP_PREPARE not CPU_ONLINE
      of: Export of_irq_find_parent()
      powerpc/xics: xics.h relies on linux/interrupt.h
      powerpc/xics: Move irq_host matching into the ics backend
      powerpc: Index crit/dbg/mcheck stacks using cpu number on 64bit
      powerpc/pci: Split IO vs MMIO indirect access hooks
      powerpc/pci: Move IO workarounds to the common kernel dir
      powerpc/pci: Make IO workarounds init implicit when first bus is registered
      powerpc/pci: Properly initialize IO workaround "private"
      powerpc/numa: Look for ibm, associativity-reference-points at the root
      powerpc/irq: Dump chip data pointer in virq_mapping
      powerpc: Add MSR_64BIT
      powerpc: Use MSR_64BIT in places
      powerpc: Use MSR_64BIT in sstep.c, fix kprobes on BOOK3E
      powerpc/book3e: Fix extlb size

Michael Neuling (1):
      powerpc: Use new CPU feature bit to select 2.06 tlbie

Michal Marek (2):
      powerpc: Call gzip with -n
      powerpc: Use the deterministic mode of ar

Milton Miller (39):
      powerpc/kexec: Fix memory corruption from unallocated slaves
      powerpc: Don't search for paca in freed memory
      powerpc/kdump64: Don't reference freed memory as pacas
      powerpc/iseries: Cleanup and fix secondary startup
      powerpc: Respect nr_cpu_ids when calling set_cpu_possible and set_cpu_present
      powerpc: Use nr_cpu_ids in initial paca allocation
      powerpc: Call no-longer static setup_nr_cpu_ids instead of replicating it
      powerpc/mpic: Limit NR_CPUS loop to 32 bit
      powerpc/mpic: Break cpumask abstraction earlier
      powerpc: Remove call sites of MSG_ALL_BUT_SELF
      powerpc: Remove checks for MSG_ALL and MSG_ALL_BUT_SELF
      powerpc/mpic: Simplify ipi cpu mask handling
      powerpc: Remove powermac/pic.h
      powerpc: Remove alloc_maybe_bootmem for zalloc version
      powerpc: Remove stubbed beat smp support
      powerpc: Move smp_ops_t from machdep.h to smp.h
      powerpc: Consolidate ipi message mux and demux
      powerpc: Add kconfig for muxed smp ipi support
      powerpc: Use bytes instead of bitops in smp ipi multiplexing
      powerpc/xics: Cleanup xics_host_map and ipi
      powerpc: Radix trees are available before init_IRQ
      powerpc: Return early if irq_host lookup type is wrong
      powerpc: Remove trival irq_host_ops.unmap
      powerpc: Remove i8259 irq_host_ops->unmap
      powerpc/fsl_msi: Don't abuse platform_data for driver_data
      powerpc/fsl_msi: Use chip_data not handler_data
      powerpc/mpc5121_ads_cpld: Remove use of NO_IRQ_IGNORE
      powerpc/mpc62xx_pic: Fix get_irq handling of NO_IRQ
      powerpc/psurge: Create a irq_host for secondary cpus
      powerpc: Remove irq_host_ops->remap hook
      powerpc/spider-pic: Get pic from chip_data instead of irq_map
      powerpc/axon_msi: Validate msi irq via chip_data
      powerpc: Add virq_is_host to reduce virq_to_host usage
      powerpc: Remove virq_to_host
      powerpc: Make IRQ_NOREQUEST last to clear, first to set
      powerpc/pseries/iommu: Add additional checks when changing iommu mask
      powerpc/pseries/iommu: Remove ddw property when destroying window
      powerpc/pseries/iommu: Find windows after kexec during boot
      powerpc/pseries/iommu: Cleanup ddw naming

Nishanth Aravamudan (5):
      cxgb4: use pgprot_writecombine() on powerpc
      powerpc: Fix kexec with dynamic dma windows
      powerpc: Ensure dtl buffers do not cross 4k boundary
      pseries/iommu: Restore iommu table pointer when restoring iommu ops
      powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created

Paul Mackerras (5):
      powerpc: Always use SPRN_SPRG_HSCRATCH0 when running in HV mode
      powerpc: Save register r9-r13 values accurately on interrupt with bad stack
      powerpc: Save Come-From Address Register (CFAR) in exception frame
      powerpc/kvm: Fix kvmppc_core_pending_dec
      powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors

Prabhakar Kushwaha (4):
      powerpc/85xx: P1020 DTS : re-organize dts files
      powerpc/85xx: P2020 DTS: re-organize dts files
      powerpc/85xx: Fix PCIe IDSEL for Px020RDB
      powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB

Richard A Lary (3):
      powerpc/pseries/eeh: Propagate needs_freset flag to device at PE
      powerpc/pseries/eeh: Handle functional reset on non-PCIe device
      powerpc/eeh: Display eeh error location for bus and device

Richard A. Lary (1):
      powerpc/eeh: Add support for ibm,configure-pe RTAS call

Robert P. J. Day (1):
      powerpc/pseries/bsr: Remove redundant initialization of bsr dev_t declaration.

Scott Wood (7):
      powerpc/e5500: set non-base IVORs
      powerpc: Add fsl mpic timer binding
      powerpc/p1022ds: fix broken mpic timer node
      powerpc/mpic: parse 4-cell intspec types other than zero
      powerpc/mpic: add the mpic global timer support
      powerpc/e5500: add networking to defconfig
      powerpc/fsl: enable verbose bug output

Sebastian Siewior (1):
      powerpc: Remove last piece of GEMINI

Stephen Rothwell (1):
      powerpc: Fix compile with icwsx support

Stratos Psomadakis (1):
      powerpc/mm: Fix compiler warning in pgtable-ppc64.h [-Wunused-but-set-variable]

Timur Tabi (1):
      powerpc/86xx: don't pretend that we support 8-bit pixels on the MPC8610 HPCD

Tseng-Hui (Frank) Lin (3):
      powerpc: Add Initiate Coprocessor Store Word (icswx) support
      powerpc/pseries: Add RTAS event log v6 definition
      powerpc/pseries: Add support for IO event interrupts

Wanlong Gao (1):
      powerpc: Fix build warning of the defconfigs

kerstin jonsson (1):
      powerpc/4xx: Fix regression in SMP on 476

 .../devicetree/bindings/net/can/fsl-flexcan.txt    |   61 +
 .../devicetree/bindings/powerpc/fsl/ifc.txt        |   76 +
 .../devicetree/bindings/powerpc/fsl/mpic-timer.txt |   38 +
 .../devicetree/bindings/powerpc/fsl/mpic.txt       |    2 +-
 arch/powerpc/Kconfig                               |    6 +
 arch/powerpc/Kconfig.debug                         |    5 +
 arch/powerpc/boot/Makefile                         |    6 +-
 arch/powerpc/boot/crt0.S                           |  116 +-
 arch/powerpc/boot/dts/p1020rdb.dts                 |  332 +-----
 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts      |  213 +++
 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts      |  148 ++
 arch/powerpc/boot/dts/p1020si.dtsi                 |  377 +++++
 arch/powerpc/boot/dts/p1022ds.dts                  |  106 +-
 arch/powerpc/boot/dts/p2020ds.dts                  |  374 +-----
 arch/powerpc/boot/dts/p2020rdb.dts                 |  378 +-----
 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts      |  245 +---
 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts      |  150 ++-
 arch/powerpc/boot/dts/p2020si.dtsi                 |  382 ++++++
 arch/powerpc/boot/epapr.c                          |   66 +
 arch/powerpc/boot/wrapper                          |   19 +-
 arch/powerpc/boot/zImage.coff.lds.S                |    6 +-
 arch/powerpc/boot/zImage.lds.S                     |   57 +-
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig    |    1 -
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig    |    1 -
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig    |    1 -
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig    |    1 -
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig    |    1 -
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig   |    1 -
 arch/powerpc/configs/c2k_defconfig                 |    4 +-
 arch/powerpc/configs/e55xx_smp_defconfig           |   39 +-
 arch/powerpc/configs/mpc85xx_defconfig             |    1 -
 arch/powerpc/configs/mpc85xx_smp_defconfig         |    1 -
 arch/powerpc/configs/mpc86xx_defconfig             |    1 -
 arch/powerpc/configs/pmac32_defconfig              |    4 +-
 arch/powerpc/configs/ppc6xx_defconfig              |    4 +-
 arch/powerpc/configs/ps3_defconfig                 |    4 +-
 arch/powerpc/configs/pseries_defconfig             |    8 +
 arch/powerpc/include/asm/cputable.h                |   55 +-
 arch/powerpc/include/asm/cputhreads.h              |   12 +-
 arch/powerpc/include/asm/dbell.h                   |    3 +-
 arch/powerpc/include/asm/emulated_ops.h            |    4 +
 arch/powerpc/include/asm/exception-64s.h           |  113 +-
 arch/powerpc/include/asm/feature-fixups.h          |   15 +-
 arch/powerpc/include/asm/firmware.h                |    3 +-
 arch/powerpc/include/asm/hvcall.h                  |   12 +
 .../cell => include/asm}/io-workarounds.h          |    1 -
 arch/powerpc/include/asm/io.h                      |   33 +-
 arch/powerpc/include/asm/io_event_irq.h            |   54 +
 arch/powerpc/include/asm/irq.h                     |   18 +-
 arch/powerpc/include/asm/kexec.h                   |    2 +-
 arch/powerpc/include/asm/kvm_asm.h                 |    1 +
 arch/powerpc/include/asm/kvm_book3s_asm.h          |    1 +
 arch/powerpc/include/asm/lppaca.h                  |    2 +
 arch/powerpc/include/asm/machdep.h                 |   22 +-
 arch/powerpc/include/asm/mmu-book3e.h              |   20 +
 arch/powerpc/include/asm/mmu-hash64.h              |    6 +
 arch/powerpc/include/asm/mmu.h                     |   52 +-
 arch/powerpc/include/asm/mmu_context.h             |   12 +-
 arch/powerpc/include/asm/mpic.h                    |    5 +-
 arch/powerpc/include/asm/pSeries_reconfig.h        |    5 +
 arch/powerpc/include/asm/paca.h                    |   11 +-
 arch/powerpc/include/asm/page_64.h                 |   21 +-
 arch/powerpc/include/asm/pgtable-ppc64.h           |   13 +-
 arch/powerpc/include/asm/ppc-opcode.h              |   35 +
 arch/powerpc/include/asm/ppc_asm.h                 |    1 +
 arch/powerpc/include/asm/processor.h               |    4 +
 arch/powerpc/include/asm/reg.h                     |  104 ++-
 arch/powerpc/include/asm/reg_a2.h                  |  165 +++
 arch/powerpc/include/asm/reg_booke.h               |   10 +-
 arch/powerpc/include/asm/rtas.h                    |   45 +-
 arch/powerpc/include/asm/scom.h                    |  156 +++
 arch/powerpc/include/asm/smp.h                     |   38 +-
 arch/powerpc/include/asm/system.h                  |    2 -
 arch/powerpc/include/asm/tlbflush.h                |    2 +
 arch/powerpc/include/asm/udbg.h                    |    1 +
 arch/powerpc/include/asm/wsp.h                     |   14 +
 arch/powerpc/include/asm/xics.h                    |  142 ++
 arch/powerpc/kernel/Makefile                       |    6 +-
 arch/powerpc/kernel/asm-offsets.c                  |    1 +
 arch/powerpc/kernel/cpu_setup_a2.S                 |  114 ++
 arch/powerpc/kernel/cpu_setup_fsl_booke.S          |    3 +
 arch/powerpc/kernel/cpu_setup_power7.S             |   91 ++
 arch/powerpc/kernel/cputable.c                     |   66 +-
 arch/powerpc/kernel/crash.c                        |   91 +-
 arch/powerpc/kernel/dbell.c                        |   65 +-
 arch/powerpc/kernel/entry_64.S                     |   27 +-
 arch/powerpc/kernel/exceptions-64e.S               |  202 +++-
 arch/powerpc/kernel/exceptions-64s.S               |  216 +++-
 arch/powerpc/kernel/head_32.S                      |   22 -
 arch/powerpc/kernel/head_64.S                      |   49 +-
 arch/powerpc/kernel/idle_power7.S                  |   97 ++
 .../{platforms/cell => kernel}/io-workarounds.c    |   31 +-
 arch/powerpc/kernel/irq.c                          |  166 +--
 arch/powerpc/kernel/kgdb.c                         |    2 +-
 arch/powerpc/kernel/lparcfg.c                      |   53 +-
 arch/powerpc/kernel/misc_32.S                      |   11 +
 arch/powerpc/kernel/misc_64.S                      |   13 +-
 arch/powerpc/kernel/paca.c                         |   30 +-
 arch/powerpc/kernel/pci_dn.c                       |    3 +-
 arch/powerpc/kernel/ppc_ksyms.c                    |    5 +-
 arch/powerpc/kernel/process.c                      |   20 +-
 arch/powerpc/kernel/prom.c                         |   64 +-
 arch/powerpc/kernel/prom_init.c                    |   30 +-
 arch/powerpc/kernel/rtas.c                         |    4 +-
 arch/powerpc/kernel/setup-common.c                 |   22 +-
 arch/powerpc/kernel/setup_32.c                     |    1 +
 arch/powerpc/kernel/setup_64.c                     |   44 +-
 arch/powerpc/kernel/signal_64.c                    |    4 +-
 arch/powerpc/kernel/smp.c                          |  138 ++-
 arch/powerpc/kernel/sysfs.c                        |   38 +
 arch/powerpc/kernel/traps.c                        |   28 +-
 arch/powerpc/kernel/udbg.c                         |    2 +
 arch/powerpc/kernel/udbg_16550.c                   |   51 +
 arch/powerpc/kernel/vector.S                       |    2 +-
 arch/powerpc/kvm/book3s.c                          |    2 +-
 arch/powerpc/kvm/book3s_rmhandlers.S               |   13 +-
 arch/powerpc/kvm/book3s_segment.S                  |   12 +-
 arch/powerpc/lib/alloc.c                           |    8 -
 arch/powerpc/lib/copypage_64.S                     |    7 +-
 arch/powerpc/lib/devres.c                          |    6 +-
 arch/powerpc/lib/sstep.c                           |   61 +-
 arch/powerpc/mm/hash_low_64.S                      |    8 +-
 arch/powerpc/mm/hash_native_64.c                   |   18 +-
 arch/powerpc/mm/hash_utils_64.c                    |   62 +-
 arch/powerpc/mm/hugetlbpage.c                      |    2 +-
 arch/powerpc/mm/mmu_context_hash64.c               |  214 +++-
 arch/powerpc/mm/mmu_context_nohash.c               |   18 +-
 arch/powerpc/mm/numa.c                             |   17 +-
 arch/powerpc/mm/pgtable_32.c                       |   12 +-
 arch/powerpc/mm/pgtable_64.c                       |   15 +-
 arch/powerpc/mm/slb.c                              |   10 +-
 arch/powerpc/mm/slb_low.S                          |    8 +-
 arch/powerpc/mm/stab.c                             |    2 +-
 arch/powerpc/platforms/44x/iss4xx.c                |    6 +-
 arch/powerpc/platforms/512x/mpc5121_ads_cpld.c     |   10 +-
 arch/powerpc/platforms/52xx/media5200.c            |    4 +-
 arch/powerpc/platforms/52xx/mpc52xx_pic.c          |   83 +-
 arch/powerpc/platforms/82xx/pq2ads-pci-pic.c       |   12 +-
 arch/powerpc/platforms/85xx/smp.c                  |   12 +-
 arch/powerpc/platforms/85xx/socrates_fpga_pic.c    |   26 +-
 arch/powerpc/platforms/86xx/gef_pic.c              |   10 +-
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c         |   99 +-
 arch/powerpc/platforms/86xx/mpc86xx_smp.c          |    6 +-
 arch/powerpc/platforms/8xx/m8xx_setup.c            |    2 +-
 arch/powerpc/platforms/Kconfig                     |   31 +-
 arch/powerpc/platforms/Kconfig.cputype             |   24 +
 arch/powerpc/platforms/Makefile                    |    1 +
 arch/powerpc/platforms/cell/Kconfig                |    4 +-
 arch/powerpc/platforms/cell/Makefile               |    9 +-
 arch/powerpc/platforms/cell/axon_msi.c             |    3 +-
 arch/powerpc/platforms/cell/beat_interrupt.c       |   27 -
 arch/powerpc/platforms/cell/beat_interrupt.h       |    3 -
 arch/powerpc/platforms/cell/beat_smp.c             |  124 --
 arch/powerpc/platforms/cell/cbe_regs.c             |   11 +-
 arch/powerpc/platforms/cell/celleb_pci.c           |   25 +-
 arch/powerpc/platforms/cell/celleb_pci.h           |    3 +-
 arch/powerpc/platforms/cell/celleb_setup.c         |    4 -
 arch/powerpc/platforms/cell/interrupt.c            |   16 +-
 arch/powerpc/platforms/cell/qpace_setup.c          |    1 -
 arch/powerpc/platforms/cell/setup.c                |    4 +-
 arch/powerpc/platforms/cell/smp.c                  |   37 +-
 arch/powerpc/platforms/cell/spider-pci.c           |    3 +-
 arch/powerpc/platforms/cell/spider-pic.c           |   21 +-
 arch/powerpc/platforms/cell/spufs/sched.c          |    2 +-
 arch/powerpc/platforms/chrp/smp.c                  |    4 +-
 arch/powerpc/platforms/embedded6xx/flipper-pic.c   |   15 +-
 arch/powerpc/platforms/embedded6xx/hlwd-pic.c      |   15 +-
 arch/powerpc/platforms/iseries/Kconfig             |    4 +-
 arch/powerpc/platforms/iseries/exception.S         |   62 +-
 arch/powerpc/platforms/iseries/irq.c               |   13 +-
 arch/powerpc/platforms/iseries/setup.c             |    9 +-
 arch/powerpc/platforms/iseries/smp.c               |   45 +-
 arch/powerpc/platforms/iseries/smp.h               |    6 -
 arch/powerpc/platforms/powermac/Kconfig            |   11 +-
 arch/powerpc/platforms/powermac/pic.c              |   25 +-
 arch/powerpc/platforms/powermac/pic.h              |   11 -
 arch/powerpc/platforms/powermac/pmac.h             |    1 +
 arch/powerpc/platforms/powermac/smp.c              |   97 +-
 arch/powerpc/platforms/ps3/interrupt.c             |    8 +-
 arch/powerpc/platforms/ps3/smp.c                   |   22 +-
 arch/powerpc/platforms/ps3/spu.c                   |    4 +-
 arch/powerpc/platforms/pseries/Kconfig             |   23 +-
 arch/powerpc/platforms/pseries/Makefile            |    2 +-
 arch/powerpc/platforms/pseries/dtl.c               |   20 +-
 arch/powerpc/platforms/pseries/eeh.c               |   82 +-
 arch/powerpc/platforms/pseries/eeh_driver.c        |   22 +-
 arch/powerpc/platforms/pseries/hotplug-cpu.c       |    5 +-
 arch/powerpc/platforms/pseries/io_event_irq.c      |  231 ++++
 arch/powerpc/platforms/pseries/iommu.c             |  117 +-
 arch/powerpc/platforms/pseries/kexec.c             |    5 +-
 arch/powerpc/platforms/pseries/lpar.c              |   48 +-
 arch/powerpc/platforms/pseries/plpar_wrappers.h    |   27 -
 arch/powerpc/platforms/pseries/ras.c               |    6 +-
 arch/powerpc/platforms/pseries/setup.c             |   50 +-
 arch/powerpc/platforms/pseries/smp.c               |   24 +-
 arch/powerpc/platforms/pseries/xics.c              |  949 -------------
 arch/powerpc/platforms/pseries/xics.h              |   23 -
 arch/powerpc/platforms/wsp/Kconfig                 |   28 +
 arch/powerpc/platforms/wsp/Makefile                |    6 +
 arch/powerpc/platforms/wsp/ics.c                   |  712 ++++++++++
 arch/powerpc/platforms/wsp/ics.h                   |   20 +
 arch/powerpc/platforms/wsp/opb_pic.c               |  332 +++++
 arch/powerpc/platforms/wsp/psr2.c                  |   95 ++
 arch/powerpc/platforms/wsp/scom_smp.c              |  427 ++++++
 arch/powerpc/platforms/wsp/scom_wsp.c              |   77 ++
 arch/powerpc/platforms/wsp/setup.c                 |   36 +
 arch/powerpc/platforms/wsp/smp.c                   |   88 ++
 arch/powerpc/platforms/wsp/wsp.h                   |   17 +
 arch/powerpc/sysdev/Kconfig                        |   10 +
 arch/powerpc/sysdev/Makefile                       |    6 +
 arch/powerpc/sysdev/axonram.c                      |    2 +-
 arch/powerpc/sysdev/cpm1.c                         |    8 +-
 arch/powerpc/sysdev/cpm2_pic.c                     |   10 +-
 arch/powerpc/sysdev/fsl_85xx_cache_sram.c          |    4 +-
 arch/powerpc/sysdev/fsl_msi.c                      |   10 +-
 arch/powerpc/sysdev/i8259.c                        |   13 -
 arch/powerpc/sysdev/ipic.c                         |   16 +-
 arch/powerpc/sysdev/mmio_nvram.c                   |    2 +
 arch/powerpc/sysdev/mpc8xx_pic.c                   |   10 +-
 arch/powerpc/sysdev/mpc8xxx_gpio.c                 |   12 +-
 arch/powerpc/sysdev/mpic.c                         |  209 ++-
 arch/powerpc/sysdev/mv64x60_pic.c                  |   14 +-
 arch/powerpc/sysdev/qe_lib/qe_ic.c                 |    6 +-
 arch/powerpc/sysdev/scom.c                         |  192 +++
 arch/powerpc/sysdev/uic.c                          |   12 +-
 arch/powerpc/sysdev/xics/Kconfig                   |   13 +
 arch/powerpc/sysdev/xics/Makefile                  |    6 +
 arch/powerpc/sysdev/xics/icp-hv.c                  |  164 +++
 arch/powerpc/sysdev/xics/icp-native.c              |  293 ++++
 arch/powerpc/sysdev/xics/ics-rtas.c                |  240 ++++
 arch/powerpc/sysdev/xics/xics-common.c             |  443 ++++++
 arch/powerpc/sysdev/xilinx_intc.c                  |    8 +-
 arch/powerpc/xmon/xmon.c                           |   38 +-
 drivers/char/bsr.c                                 |    2 +-
 drivers/infiniband/hw/cxgb4/t4.h                   |    5 +-
 drivers/macintosh/via-pmu.c                        |   56 +-
 drivers/misc/Kconfig                               |    1 +
 drivers/misc/Makefile                              |    1 +
 drivers/misc/carma/Kconfig                         |   17 +
 drivers/misc/carma/Makefile                        |    2 +
 drivers/misc/carma/carma-fpga-program.c            | 1141 ++++++++++++++++
 drivers/misc/carma/carma-fpga.c                    | 1433 ++++++++++++++++++++
 drivers/of/irq.c                                   |    2 +-
 include/linux/of_irq.h                             |    1 +
 244 files changed, 11490 insertions(+), 4116 deletions(-)
 create mode 100755 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/mpic-timer.txt
 create mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
 create mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
 create mode 100644 arch/powerpc/boot/dts/p1020si.dtsi
 create mode 100644 arch/powerpc/boot/dts/p2020si.dtsi
 create mode 100644 arch/powerpc/boot/epapr.c
 rename arch/powerpc/{platforms/cell => include/asm}/io-workarounds.h (97%)
 create mode 100644 arch/powerpc/include/asm/io_event_irq.h
 create mode 100644 arch/powerpc/include/asm/reg_a2.h
 create mode 100644 arch/powerpc/include/asm/scom.h
 create mode 100644 arch/powerpc/include/asm/wsp.h
 create mode 100644 arch/powerpc/include/asm/xics.h
 create mode 100644 arch/powerpc/kernel/cpu_setup_a2.S
 create mode 100644 arch/powerpc/kernel/cpu_setup_power7.S
 create mode 100644 arch/powerpc/kernel/idle_power7.S
 rename arch/powerpc/{platforms/cell => kernel}/io-workarounds.c (95%)
 delete mode 100644 arch/powerpc/platforms/cell/beat_smp.c
 delete mode 100644 arch/powerpc/platforms/iseries/smp.h
 delete mode 100644 arch/powerpc/platforms/powermac/pic.h
 create mode 100644 arch/powerpc/platforms/pseries/io_event_irq.c
 delete mode 100644 arch/powerpc/platforms/pseries/xics.c
 delete mode 100644 arch/powerpc/platforms/pseries/xics.h
 create mode 100644 arch/powerpc/platforms/wsp/Kconfig
 create mode 100644 arch/powerpc/platforms/wsp/Makefile
 create mode 100644 arch/powerpc/platforms/wsp/ics.c
 create mode 100644 arch/powerpc/platforms/wsp/ics.h
 create mode 100644 arch/powerpc/platforms/wsp/opb_pic.c
 create mode 100644 arch/powerpc/platforms/wsp/psr2.c
 create mode 100644 arch/powerpc/platforms/wsp/scom_smp.c
 create mode 100644 arch/powerpc/platforms/wsp/scom_wsp.c
 create mode 100644 arch/powerpc/platforms/wsp/setup.c
 create mode 100644 arch/powerpc/platforms/wsp/smp.c
 create mode 100644 arch/powerpc/platforms/wsp/wsp.h
 create mode 100644 arch/powerpc/sysdev/scom.c
 create mode 100644 arch/powerpc/sysdev/xics/Kconfig
 create mode 100644 arch/powerpc/sysdev/xics/Makefile
 create mode 100644 arch/powerpc/sysdev/xics/icp-hv.c
 create mode 100644 arch/powerpc/sysdev/xics/icp-native.c
 create mode 100644 arch/powerpc/sysdev/xics/ics-rtas.c
 create mode 100644 arch/powerpc/sysdev/xics/xics-common.c
 create mode 100644 drivers/misc/carma/Kconfig
 create mode 100644 drivers/misc/carma/Makefile
 create mode 100644 drivers/misc/carma/carma-fpga-program.c
 create mode 100644 drivers/misc/carma/carma-fpga.c

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

[Benjamin Herrenschmidt]

On Wed, 2011-05-18 at 21:11 -0700, Linus Torvalds wrote:
> On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
> >
> > Dunno if it's too late or not yet but here's 3 fixes for powerpc that
> > would be welcome to have in before the release. If not I'll send them
> > first thing next (one of them is already in -next in fact).
> 
> Gah. I just cut 2.6.39.

Bah, no biggie. I'll stick some CC: stable and put them in -next :-)

Cheers,
Ben.

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

[David Miller]

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2011 21:11:47 -0700

> On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
>>
>> Dunno if it's too late or not yet but here's 3 fixes for powerpc that
>> would be welcome to have in before the release. If not I'll send them
>> first thing next (one of them is already in -next in fact).
> 
> Gah. I just cut 2.6.39.

I know we can't let these things go forever, but in my opinion
we should have given this one or two more -rc's.

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

[Linus Torvalds]

On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
>
> Dunno if it's too late or not yet but here's 3 fixes for powerpc that
> would be welcome to have in before the release. If not I'll send them
> first thing next (one of them is already in -next in fact).

Gah. I just cut 2.6.39.

          Linus

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus

Dunno if it's too late or not yet but here's 3 fixes for powerpc that
would be welcome to have in before the release. If not I'll send them
first thing next (one of them is already in -next in fact).

Those are regression fixes and a build breakage.

Cheers,
Ben.

The following changes since commit fce519588acfac249e8fdc1f5016c73d617de315:

  Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-05-18 13:25:57 -0700)

are available in the git repository at:

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

Ben Hutchings (1):
      powerpc/kexec: Fix build failure on 32-bit SMP

Benjamin Herrenschmidt (1):
      powerpc/smp: Make start_secondary_resume available to all CPU variants

kerstin jonsson (1):
      powerpc/4xx: Fix regression in SMP on 476

 arch/powerpc/kernel/crash.c   |   59 +++++++++++++++++++++--------------------
 arch/powerpc/kernel/head_32.S |    9 ------
 arch/powerpc/kernel/misc_32.S |   11 +++++++
 arch/powerpc/kernel/smp.c     |    4 +-
 4 files changed, 43 insertions(+), 40 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few fixes and quirks for powerpc post -rc3. Hopefully that
should be the end of it pending major bugs/issues/regressions.

Cheers,
Ben.

The following changes since commit a1b49cb7e2a7961ec3aa8b64860bf480d4ec9077:

  Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (2011-04-17 17:37:02 -0700)

are available in the git repository at:

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

Anton Blanchard (1):
      powerpc: Fix oops if scan_dispatch_log is called too early

Benjamin Herrenschmidt (2):
      Merge remote branch 'kumar/merge' into merge
      powerpc/powermac: Build fix with SMP and CPU hotplug

Eric B Munson (1):
      powerpc/perf_event: Skip updating kernel counters if register value shrinks

Kumar Gala (2):
      powerpc/book3e: Fix CPU feature handling on 64-bit e5500
      powerpc/85xx: disable Suspend support if SMP enabled

Nishanth Aravamudan (1):
      powerpc/pseries: Use a kmem cache for DTL buffers

Paul Gortmaker (1):
      powerpc/kexec: Fix regression causing compile failure on UP

Prabhakar Kushwaha (2):
      powerpc/85xx: Don't add disabled PCIe devices
      powerpc: Check device status before adding serial device

Scott Wood (1):
      powerpc/e500mc: Remove CPU_FTR_MAYBE_CAN_NAP/CPU_FTR_MAYBE_CAN_DOZE

Stefan Roese (1):
      powerpc: Don't write protect kernel text with CONFIG_DYNAMIC_FTRACE enabled

 arch/powerpc/Kconfig                   |    2 +-
 arch/powerpc/include/asm/cputable.h    |   16 ++++++++++++-
 arch/powerpc/include/asm/pte-common.h  |    2 +-
 arch/powerpc/kernel/cputable.c         |    2 +-
 arch/powerpc/kernel/crash.c            |   12 +++++-----
 arch/powerpc/kernel/legacy_serial.c    |    8 ++++--
 arch/powerpc/kernel/perf_event.c       |   37 +++++++++++++++++++++++++------
 arch/powerpc/kernel/time.c             |    3 ++
 arch/powerpc/platforms/powermac/smp.c  |    8 ++++--
 arch/powerpc/platforms/pseries/setup.c |   12 ++++++++-
 arch/powerpc/sysdev/fsl_pci.c          |    5 ++++
 11 files changed, 81 insertions(+), 26 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Some minor powerpc fixes for you, freescale device-tree updates
and a few nits like wrong ifdef's etc... 

Cheers,
Ben.

The following changes since commit b2a8b4b81966094703088a7bc76a313af841924d:

  Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-04-04 17:56:07 -0700)

are available in the git repository at:

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

Benjamin Herrenschmidt (2):
      Merge remote branch 'kumar/merge' into merge
      powerpc/pseries: Don't register global initcall

Kumar Gala (1):
      edac/mpc85xx: Limit setting/clearing of HID1[RFXE] to e500v1/v2 cores

Matt Evans (1):
      powerpc/pseries: Fix build without CONFIG_HOTPLUG_CPU

Paul Gortmaker (1):
      powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP.

Prabhakar Kushwaha (1):
      powerpc/85xx: Update dts for PCIe memory maps to match u-boot of Px020RDB

Ryan Grimm (1):
      powerpc: Set nr_cpu_ids early and use it to free PACAs

 arch/powerpc/boot/dts/p1020rdb.dts            |   12 +++++-----
 arch/powerpc/boot/dts/p2020rdb.dts            |   12 +++++-----
 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts |    4 +-
 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts |   10 ++++----
 arch/powerpc/kernel/crash.c                   |    6 ++--
 arch/powerpc/kernel/paca.c                    |    2 +-
 arch/powerpc/kernel/setup-common.c            |    3 ++
 arch/powerpc/platforms/pseries/setup.c        |    2 +-
 arch/powerpc/platforms/pseries/smp.c          |   17 ++++++++++-----
 drivers/edac/mpc85xx_edac.c                   |   27 +++++++++++++++++-------
 10 files changed, 57 insertions(+), 38 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Some more powerpc bits for you.

One is actually a change from Anton to the generic kexec to make a
function weak so powerpc can override it.

It has been around for ever, there were initial objections I think
mostly due to a misunderstanding of the problem.

Since then, it's been a deafening silence to our responses/expanations
and no answers from Eric so I think it should go in as the powerpc
counterpart that implements our version of that weak function is already
(and has been for a while as d72e063bb32c06c6c1cec14f6857b7c37ba62d7a)
and it fixes a real nasty bug.

The rest is a series of fixes to our CPU hotplug code that I've been
sitting on for a little while (by myself) and was originally thinking
about putting in for the next release.

I eventually changed my mind, there is no point in sitting on them any
longer since they fix some real issues on some machines (such as G5's
crashing on re-plug) and brings us in line with what other archs do for
setting up and re-initializing the idle threads.

Cheers,
Ben.

The following changes since commit ecb78ab6f30106ab72a575a25b1cdfd1633b7ca2:

  Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (2011-03-30 12:22:15 -0700)

are available in the git repository at:

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

Anton Blanchard (1):
      kdump: Allow shrinking of kdump region to be overridden

Benjamin Herrenschmidt (18):
      powerpc: Make decrementer interrupt robust against offlined CPUs
      powerpc/smp: soft-replugged CPUs must go back to start_secondary
      powerpc/smp: Fix generic_mach_cpu_die()
      powerpc/smp: Remove unused generic_cpu_enable()
      powerpc/smp: Remove unused smp_ops->cpu_enable()
      powerpc/pmac/smp: Fix 32-bit PowerMac cpu_die
      powerpc/pmac/smp: Rename fixup_irqs() to migrate_irqs() and use it on ppc32
      powerpc/pmac/smp: Fixup smp_core99_cpu_disable() and use it on 64-bit
      powerpc/pmac/smp: Consolidate 32-bit and 64-bit PowerMac cpu_die in one file
      powerpc/pmac/smp: Remove HMT changes for PowerMac offline code
      powerpc/pmac/smp: Properly NAP offlined CPU on G5
      powerpc/pmac: Rename cpu_state in therm_pm72 to avoid collision
      powerpc/smp: Add a smp_ops->bringup_up() done callback
      powerpc/pmac/smp: Fix CPU hotplug crashes on some machines
      powerpc/smp: Don't expose per-cpu "cpu_state" array
      powerpc/smp: Create idle threads on demand and properly reset them
      powerpc/smp: Increase vdso_data->processorCount, not just decrease it
      powerpc/pmac/smp: Remove no-longer needed preempt workaround

 arch/powerpc/include/asm/machdep.h              |    3 +-
 arch/powerpc/include/asm/smp.h                  |    5 +-
 arch/powerpc/kernel/head_32.S                   |    9 ++
 arch/powerpc/kernel/head_64.S                   |    7 +
 arch/powerpc/kernel/idle_power4.S               |   21 ---
 arch/powerpc/kernel/irq.c                       |    3 +-
 arch/powerpc/kernel/smp.c                       |  153 ++++++++++++++--------
 arch/powerpc/kernel/time.c                      |   15 ++-
 arch/powerpc/platforms/powermac/pmac.h          |    1 -
 arch/powerpc/platforms/powermac/setup.c         |   56 --------
 arch/powerpc/platforms/powermac/smp.c           |  154 ++++++++++++++++-------
 arch/powerpc/platforms/pseries/offline_states.h |    2 -
 drivers/macintosh/therm_pm72.c                  |   60 +++++-----
 include/linux/kexec.h                           |    1 +
 kernel/kexec.c                                  |    5 +-
 15 files changed, 272 insertions(+), 223 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few post -rc1 fixes for powerpc.

Mostly some more fallout from the irq core rework, new syscalls wireup,
defconfig fixes and minor bits. The only feature-esque thing in there
would be me adding dma_mmap_coherent(), it fixes various audio devices
on our older non cache-coherent embedded platforms.

Freescale folks: I've manually added two patches to fix some FSL 8xx and
QE irq build problems caused by the upstream irq rework to the branch.
Please verify that it's all correct and if not send followup patches.

Linus: I didn't wait for hera to sync to the mirrors before sending this
email (I usually do but I have to run and it's very slow today).

The following changes since commit 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d:

  Linux 2.6.39-rc1 (2011-03-29 12:09:47 -0700)

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

Anton Blanchard (2):
      powerpc: Fix accounting of softirq time when idle
      powerpc/pseries: Enable Chelsio network and iWARP drivers

Benjamin Herrenschmidt (4):
      powerpc: Implement dma_mmap_coherent()
      powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory
      powerpc/8xx: Fix another breakage from the irq_data conversion
      powerpc/qe_ic: Fix another breakage from the irq_data conversion

Jim Keniston (1):
      powerpc/nvram: Don't overwrite oops/panic report on normal shutdown

Milton Miller (3):
      powerpc/xics: Fix numberspace mismatch from irq_desc conversion
      powerpc/xics: Use hwirq for xics domain irq number
      powerpc/pseries/smp: query-cpu-stopped-state support won't change

Scott Wood (1):
      powerpc: ARCH_PFN_OFFSET should be unsigned long

Stephen Rothwell (2):
      powerpc: Restore some misc devices to our configs
      powerpc: Wire up new syscalls

Thomas Gleixner (1):
      powerpc/cell: Use handle_edge_eoi_irq for real

Varun Sethi (1):
      powerpc/booke: Correct the SPRN_MAS5 definition.

 arch/powerpc/configs/44x/warp_defconfig          |    1 +
 arch/powerpc/configs/52xx/motionpro_defconfig    |    1 +
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig    |    1 +
 arch/powerpc/configs/86xx/gef_sbc310_defconfig   |    1 +
 arch/powerpc/configs/86xx/gef_sbc610_defconfig   |    1 +
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig |    1 +
 arch/powerpc/configs/e55xx_smp_defconfig         |    1 +
 arch/powerpc/configs/linkstation_defconfig       |    1 +
 arch/powerpc/configs/mpc512x_defconfig           |    1 +
 arch/powerpc/configs/mpc5200_defconfig           |    1 +
 arch/powerpc/configs/mpc85xx_defconfig           |    1 +
 arch/powerpc/configs/mpc85xx_smp_defconfig       |    1 +
 arch/powerpc/configs/mpc86xx_defconfig           |    1 +
 arch/powerpc/configs/pasemi_defconfig            |    1 +
 arch/powerpc/configs/ppc6xx_defconfig            |    1 +
 arch/powerpc/configs/pseries_defconfig           |    3 +
 arch/powerpc/include/asm/dma-mapping.h           |    6 ++
 arch/powerpc/include/asm/mmu-hash64.h            |    2 +-
 arch/powerpc/include/asm/page.h                  |    2 +-
 arch/powerpc/include/asm/qe_ic.h                 |   16 +++---
 arch/powerpc/include/asm/reg_booke.h             |    2 +-
 arch/powerpc/include/asm/systbl.h                |    4 +
 arch/powerpc/include/asm/unistd.h                |    6 ++-
 arch/powerpc/kernel/dma.c                        |   18 ++++++
 arch/powerpc/kernel/exceptions-64s.S             |   28 ++++----
 arch/powerpc/kernel/time.c                       |    2 +-
 arch/powerpc/mm/dma-noncoherent.c                |   20 ++++++
 arch/powerpc/platforms/cell/interrupt.c          |    2 +-
 arch/powerpc/platforms/pseries/nvram.c           |   24 +++++++
 arch/powerpc/platforms/pseries/smp.c             |    4 +-
 arch/powerpc/platforms/pseries/xics.c            |   71 +++++++++++-----------
 arch/powerpc/sysdev/mpc8xx_pic.c                 |    2 +-
 32 files changed, 161 insertions(+), 66 deletions(-)

Cheers,
Ben.


 

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus

Here's a fix for the regression introduced by
b5d937de0367d26f65b9af1aef5f2c34c1939be0 along with a bug fix from Mike
Wolf for a nasty BUG_ON() that shoudn't be there for some odd case of
threaded core dumps, and 3 patches from Meador Inge that I plain forgot
to include before.

Cheers,
Ben.

The following changes since commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (2011-03-19 22:27:06 -0700)

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      powerpc/pci: Fix crash in PCI code on ppc64 when matching device nodes

Meador Inge (3):
      powerpc: Document the Open PIC device tree binding
      powerpc: Make MPIC honor the "pic-no-reset" device tree property
      powerpc: Factoring mpic cpu id fetching into a function

Mike Wolf (1):
      powerpc/ptrace: Remove BUG_ON when full register set not available

 Documentation/devicetree/bindings/open-pic.txt |   98 ++++++++++++++++++++++++
 arch/powerpc/include/asm/mpic.h                |    4 +
 arch/powerpc/include/asm/ptrace.h              |    2 +
 arch/powerpc/kernel/pci_dn.c                   |    7 +-
 arch/powerpc/kernel/ptrace.c                   |   15 +++-
 arch/powerpc/sysdev/mpic.c                     |   85 +++++++++++++++-----
 6 files changed, 184 insertions(+), 27 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/open-pic.txt

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

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(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are 3 patches for powerpc, one reverts an Anton mistake (such a thing
does exist indeed ! here goes my blind faith...) and a couple of fixes
that would be much welcome to have in .38

Cheers,
Ben.

The following changes since commit dd9c1549edef02290edced639f67b54a25abbe0e:

  Linux 2.6.38-rc7 (2011-03-01 13:55:12 -0800)

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

Anton Blanchard (1):
      powerpc/kexec: Restore ppc_md.machine_kexec

K.Prasad (1):
      powerpc: Fix call to flush_ptrace_hw_breakpoint()

Peter Zijlstra (1):
      powerpc/mm: Make hpte_need_flush() safe for preemption

 arch/powerpc/include/asm/machdep.h  |    6 ++++++
 arch/powerpc/kernel/machine_kexec.c |    5 ++++-
 arch/powerpc/kernel/process.c       |    8 +++++---
 arch/powerpc/mm/tlb_hash64.c        |    6 +++---
 4 files changed, 18 insertions(+), 7 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few powerpc bug fixes for you. Mostly Anton and Jesse fixing
up the new VPNH feature (which was added this cycle) and a handful of
other fixes worth having.

Cheers,
Ben.

The following changes since commit 8dbdea8444d303a772bceb1ba963f0e3273bfc5e:

  Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 (2011-02-06 12:05:58 -0800)

are available in the git repository at:

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

Anton Blanchard (6):
      powerpc/numa: Only use active VPHN count fields
      powerpc/numa: Check for all VPHN changes
      powerpc/numa: Add length when creating OF properties via VPHN
      powerpc/numa: Disable VPHN on dedicated processor partitions
      powerpc/numa: Fix bug in unmap_cpu_from_node
      powerpc: Fix hcall tracepoint recursion

Benjamin Herrenschmidt (2):
      powerpc: Pass the right cpu_spec to ->setup_cpu() on 64-bit
      powerpc: Fix some 6xx/7xxx CPU setup functions

Jesse Larrew (3):
      powerpc/pseries: Fix typo in VPHN comments
      powerpc/pseries: Fix brace placement in numa.c
      powerpc/pseries: Remove unnecessary variable initializations in numa.c

Scott Wood (2):
      powerpc: Fix pfn_valid() when memory starts at a non-zero address
      powerpc/book3e: Protect complex macro args in mmu-book3e.h

 arch/powerpc/include/asm/mmu-book3e.h |    8 ++--
 arch/powerpc/include/asm/page.h       |    2 +-
 arch/powerpc/kernel/cpu_setup_6xx.S   |   40 ++++++++++++------------
 arch/powerpc/kernel/cputable.c        |    4 +-
 arch/powerpc/mm/numa.c                |   55 ++++++++++++++++++---------------
 arch/powerpc/platforms/pseries/lpar.c |   37 ++++++++++++++++++++++
 6 files changed, 94 insertions(+), 52 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a bunch of powerpc stuff for you to pull. There's a whole series from
Anton which is in large part trivial cleanups, but it's all obvious enough
stuff or worthy enough fixes that I decided to not wait until the next merge
window (besides it's from Anton :-)

The rest is generally minor fixes. The two simple_write_to_buffer changes
from Akinobu were around for a while (and Andrew had picked them up already),
I just happen to have "missed" them in my collection for the previous batch.

Cheers,
Ben.

The following changes since commit 12fcdba1b7ae8b25696433f420b775aeb556d89b:

  Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2011-01-19 20:27:25 -0800)

are available in the git repository at:

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

Akinobu Mita (2):
      powerpc/spufs: Use simple_write_to_buffer
      powerpc/rtas_flash: Use simple_read_from_buffer

Anton Blanchard (19):
      powerpc/kexec: Move all ppc_md kexec function pointers together
      powerpc/kexec: Remove ppc_md.machine_kexec_cleanup
      powerpc/kexec: Remove ppc_md.machine_kexec
      powerpc/kdump: Remove ppc_md.machine_crash_shutdown
      powerpc/kexec: Don't initialise kexec hooks to default handlers
      powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare
      powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler
      powerpc/kdump: Disable ftrace during kexec
      powerpc: Print 32 bits of DSISR in show_regs
      powerpc: Don't force MSR_RI in machine_check_exception
      powerpc: Never halt RTAS error logging after receiving an unrecoverable machine check
      powerpc: Remove duplicate debugger hook in machine_check_exception
      powerpc: Don't silently handle machine checks from userspace
      powerpc: Rework pseries machine check handler
      powerpc: Fix corruption when grabbing FWNMI data
      powerpc: Check RTAS extended log flag before checking length
      powerpc: machine_check_generic is wrong on 64bit
      powerpc: Disable mcount tracers in pseries defconfig
      powerpc: Enable 64kB pages and 1024 threads in pseries config

Ben Hutchings (1):
      powerpc/boot/dts: Install dts from the right directory

Benjamin Herrenschmidt (1):
      Merge remote branch 'kumar/next' into merge

Ilya Yanok (1):
      powerpc/mpc8308: fix USB DR controller initialization

Li Yang (1):
      powerpc/85xx: add e500 HID1 bit definition

Michael Ellerman (1):
      powerpc: Ensure the else case of feature sections will fit

Nishanth Aravamudan (1):
      powerpc/pseries: Add BNX2=m to defconfig

Scott Wood (1):
      powerpc/mpic: Fix mask/unmask timeout message

Shaohui Xie (1):
      powerpc/fsl_rio: Fix non-standard HID1 register access

Steven Rostedt (2):
      powerpc/ppc64/tracing: Add stack frame to calls of trace_hardirqs_on/off
      powerpc/ppc32/tracing: Add stack frame to calls of trace_hardirqs_on/off

Tejun Heo (1):
      powerpc/cell: Use system_wq in cpufreq_spudemand

Timur Tabi (2):
      powerpc/85xx: fix compatible properties of the P1022DS DMA nodes used for audio
      powerpc: fix warning when compiling immap_qe.h

roel kluin (1):
      powerpc/macintosh: Fix wrong test in fan_{read,write}_reg()

 arch/powerpc/boot/Makefile                      |    2 +-
 arch/powerpc/boot/dts/mpc8308rdb.dts            |    2 +-
 arch/powerpc/boot/dts/p1022ds.dts               |    4 +-
 arch/powerpc/configs/pseries_defconfig          |    7 +-
 arch/powerpc/include/asm/feature-fixups.h       |   27 ++++---
 arch/powerpc/include/asm/immap_qe.h             |   21 ++++--
 arch/powerpc/include/asm/irqflags.h             |   40 +++++++--
 arch/powerpc/include/asm/machdep.h              |   18 +----
 arch/powerpc/include/asm/reg.h                  |    2 +
 arch/powerpc/include/asm/reg_booke.h            |   14 +++
 arch/powerpc/include/asm/spu.h                  |    8 --
 arch/powerpc/kernel/cpu_setup_fsl_booke.S       |    6 ++
 arch/powerpc/kernel/cputable.c                  |   23 -----
 arch/powerpc/kernel/crash.c                     |   72 +----------------
 arch/powerpc/kernel/entry_32.S                  |   11 +++
 arch/powerpc/kernel/machine_kexec.c             |   19 ++--
 arch/powerpc/kernel/process.c                   |    2 +-
 arch/powerpc/kernel/rtas_flash.c                |   53 ++-----------
 arch/powerpc/kernel/rtasd.c                     |    2 +-
 arch/powerpc/kernel/time.c                      |   25 +++++-
 arch/powerpc/kernel/traps.c                     |   12 +---
 arch/powerpc/lib/feature-fixups-test.S          |   19 ++++
 arch/powerpc/platforms/83xx/mpc83xx.h           |    2 +
 arch/powerpc/platforms/83xx/usb.c               |   21 ++++-
 arch/powerpc/platforms/cell/cpufreq_spudemand.c |   20 +----
 arch/powerpc/platforms/cell/qpace_setup.c       |    5 -
 arch/powerpc/platforms/cell/spu_base.c          |   70 ++++++++++++++++
 arch/powerpc/platforms/cell/spufs/file.c        |   27 ++-----
 arch/powerpc/platforms/embedded6xx/gamecube.c   |   11 ---
 arch/powerpc/platforms/embedded6xx/wii.c        |   11 ---
 arch/powerpc/platforms/pseries/kexec.c          |   10 --
 arch/powerpc/platforms/pseries/ras.c            |  102 +++++++++++++++-------
 arch/powerpc/sysdev/fsl_rio.c                   |    2 -
 arch/powerpc/sysdev/mpic.c                      |    6 +-
 drivers/macintosh/therm_pm72.c                  |    4 +-
 35 files changed, 334 insertions(+), 346 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's the powerpc bunch for this merge window. Small this time, looks
like Kumar was too busy with holidays to send me anything from freescale
this time around.

There's some rework & cleanup of our nvram code, some support for the
POWER7+ processors, various iommu cleanups, etc... in terms of features,
we can note the support for some of IBM System P energy management and
VPHN feature which improves NUMA topology informations under our
hypervisor.

The following changes since commit 5b2eef966cb2ae307aa4ef1767f7307774bc96ca:

  Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-01-10 17:11:39 -0800)

are available in the git repository at:

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

Anatolij Gustschin (1):
      powerpc/5xxx: extend mpc8xxx_gpio driver to support mpc512x gpios

Andreas Schwab (2):
      powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S
      powerpc: Update compat_arch_ptrace

Anton Blanchard (5):
      powerpc: Add support for popcnt instructions
      powerpc/kdump: Override crash_free_reserved_phys_range to avoid freeing RTAS
      powerpc: Hardcode popcnt instructions for old assemblers
      powerpc: Fix incorrect comment about interrupt stack allocation
      powerpc: iommu: Add device name to iommu error printks

Benjamin Herrenschmidt (16):
      powerpc/nvram: Move things out of asm/nvram.h
      powerpc/nvram: More flexible nvram_create_partition()
      powerpc/nvram: nvram_create_partitions() now uses bytes
      powerpc/nvram: Ensure that the partition header/block size is right
      powerpc/nvram: Completely clear a new partition
      powerpc/nvram: Shuffle code around in nvram_create_partition()
      powerpc/nvram: Improve partition removal
      powerpc/nvram: Add nvram_find_partition()
      powerpc/nvram: Change nvram_setup_partition() to use new helper
      powerpc/nvram: Move the log partition stuff to pseries
      powerpc/nvram: Rename ppc64,linux partition to ibm,rtas-log
      Merge branch 'nvram' into next
      Merge remote branch 'jwb/next' into next
      powerpc/pseries: Pass phb only to iommu_table_setparms_lpar
      Merge remote branch 'gcl/next' into next
      powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA

Christian Dietrich (1):
      powerpc: Removing undead ifdef __KERNEL__

FUJITA Tomonori (1):
      powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT

Grant Likely (1):
      Merge v2.6.37-rc8 into powerpc/next

Heiko Schocher (1):
      powerpc/time: printk time stamp init not correct

Ilya Yanok (6):
      powerpc/512x: scatter/gather dma fix
      powerpc/512x: fix the hanged dma transfer issue
      powerpc/512x: add MPC8308 dma support
      powerpc/512x: try to free dma descriptors in case of allocation failure
      powerpc/83xx: add DMA controller to mpc8308 device-tree node
      powerpc/83xx: add mpc8308_p1m DMA controller device-tree node

Jesper Juhl (3):
      powerpc/cell: Use vzalloc rather than vmalloc and memset in spu_alloc_lscsa_std
      powerpc/iseries: Remove unused mf_getSrcHistory function and caller.
      powerpc: Remove unnecessary casts of void ptr

Jesse Larrew (4):
      powerpc: Add VPHN firmware feature
      powerpc/pseries: Poll VPA for topology changes and update NUMA maps
      powerpc: Disable VPHN polling during a suspend operation
      powerpc/pseries: Fix VPHN build errors on non-SMP systems

Jim Keniston (2):
      powerpc/nvram: Fix NVRAM partition list setup
      powerpc/nvram: Handle partition names >= 12 chars

Joe Perches (2):
      drivers/char/hvc_vio: Use static const char arrays
      powerpc/pci: Use printf extension %pR for struct resource

Lennert Buytenhek (1):
      powerpc: Fix two typos in Documentation/powerpc/booting-without-of.txt

Marc Zyngier (1):
      powerpc/powermac: Make auto-loading of therm_pm72 possible

Michael Ellerman (2):
      powerpc: Consolidate obj-y assignments
      powerpc: Record vma->phys_addr in ioremap()

Michael Neuling (4):
      powerpc: Remove unneeded cpu_setup/restore from POWER7 cputable entry
      powerpc: Remove POWER6 oprofile workarounds for POWER7
      powerpc: Add POWER7+ cputable entry
      powerpc/mm: Avoid avoidable void* pointer

Nishanth Aravamudan (11):
      powerpc/vio: Use dma ops helpers
      powerpc/pasemi: Clean up pasemi iommu table initializations
      powerpc/cell: Beat dma ops cleanup
      powerpc/dart: iommu table cleanup
      powerpc/pseries: iommu cleanup
      powerpc/macio: Ensure all dma routines get copied over
      powerpc: Add memory_hotplug_max()
      powerpc/iommu: Use coherent_dma_mask for alloc_coherent
      powerpc/pseries: Do not search for dma-window property on dlpar remove
      powerpc/pseries: Checking for pdn->parent is redundant
      powerpc/pseries: Do not need to check for dma_window == NULL

Sebastian Siewior (1):
      of/address: Use propper endianess in get_flags

Sonny Rao (2):
      Powerpc: separate CONFIG_RELOCATABLE from CONFIG_CRASHDUMP in boot code
      powerpc: Minor cleanups for machdep.h

Srikanth Krishnakar (1):
      rtc-cmos.c : Fix warning on PowerPC

Stephen Rothwell (1):
      powerpc: Remove second definition of STACK_FRAME_OVERHEAD

Tracey Dent (1):
      powerpc/ps3: Replace the use of <module>-objs with <module>-y

Vaidyanathan Srinivasan (2):
      powerpc: Cleanup APIs for cpu/thread/core mappings
      powerpc: Add support for new hcall H_BEST_ENERGY

Victor Gallardo (3):
      powerpc/4xx: Add suspend and idle support
      powerpc/4xx: Add Kilauea suspend and idle support
      powerpc/4xx: Add Canyonlands suspend and idle support

Will Schmidt (1):
      powerpc/pseries: Add kernel parameter to disable batched hcalls

 Documentation/kernel-parameters.txt             |    8 +
 Documentation/powerpc/booting-without-of.txt    |    4 +-
 Documentation/powerpc/dts-bindings/4xx/cpm.txt  |   52 +++
 arch/powerpc/Kconfig                            |   16 +-
 arch/powerpc/boot/dts/canyonlands.dts           |   31 +-
 arch/powerpc/boot/dts/kilauea.dts               |    9 +
 arch/powerpc/boot/dts/mpc8308_p1m.dts           |    8 +
 arch/powerpc/boot/dts/mpc8308rdb.dts            |    8 +
 arch/powerpc/configs/40x/kilauea_defconfig      |    5 +
 arch/powerpc/configs/44x/canyonlands_defconfig  |    3 +
 arch/powerpc/include/asm/bitops.h               |    9 +
 arch/powerpc/include/asm/cputable.h             |    9 +-
 arch/powerpc/include/asm/cputhreads.h           |   15 +-
 arch/powerpc/include/asm/device.h               |    6 +
 arch/powerpc/include/asm/firmware.h             |    3 +-
 arch/powerpc/include/asm/hvcall.h               |    4 +-
 arch/powerpc/include/asm/lppaca.h               |    5 +-
 arch/powerpc/include/asm/machdep.h              |    6 +-
 arch/powerpc/include/asm/mmzone.h               |    5 +
 arch/powerpc/include/asm/nvram.h                |   52 +--
 arch/powerpc/include/asm/ppc-opcode.h           |    8 +
 arch/powerpc/include/asm/processor.h            |    2 -
 arch/powerpc/include/asm/prom.h                 |    2 +-
 arch/powerpc/include/asm/topology.h             |   15 +-
 arch/powerpc/include/asm/vdso_datapage.h        |    2 -
 arch/powerpc/kernel/Makefile                    |    9 +-
 arch/powerpc/kernel/asm-offsets.c               |    1 -
 arch/powerpc/kernel/cputable.c                  |   22 +-
 arch/powerpc/kernel/crash_dump.c                |   33 ++
 arch/powerpc/kernel/dma-iommu.c                 |    2 +-
 arch/powerpc/kernel/entry_32.S                  |    1 +
 arch/powerpc/kernel/exceptions-64s.S            |    1 +
 arch/powerpc/kernel/fpu.S                       |    1 +
 arch/powerpc/kernel/head_40x.S                  |    1 +
 arch/powerpc/kernel/head_44x.S                  |    1 +
 arch/powerpc/kernel/head_64.S                   |    7 +-
 arch/powerpc/kernel/head_8xx.S                  |    1 +
 arch/powerpc/kernel/head_fsl_booke.S            |    1 +
 arch/powerpc/kernel/iommu.c                     |   14 +-
 arch/powerpc/kernel/misc.S                      |    5 -
 arch/powerpc/kernel/misc_32.S                   |    1 +
 arch/powerpc/kernel/misc_64.S                   |    1 +
 arch/powerpc/kernel/nvram_64.c                  |  481 ++++++++---------------
 arch/powerpc/kernel/pci_64.c                    |    3 +-
 arch/powerpc/kernel/ppc_ksyms.c                 |    7 +
 arch/powerpc/kernel/ppc_save_regs.S             |    1 +
 arch/powerpc/kernel/ptrace.c                    |   22 +-
 arch/powerpc/kernel/ptrace32.c                  |    7 +
 arch/powerpc/kernel/rtas.c                      |    3 +
 arch/powerpc/kernel/setup_64.c                  |    4 +-
 arch/powerpc/kernel/smp.c                       |   19 +-
 arch/powerpc/kernel/time.c                      |    2 +-
 arch/powerpc/kernel/vector.S                    |    1 +
 arch/powerpc/kernel/vio.c                       |   15 +-
 arch/powerpc/lib/Makefile                       |    2 +-
 arch/powerpc/lib/hweight_64.S                   |  110 +++++
 arch/powerpc/mm/hash_utils_64.c                 |    2 +-
 arch/powerpc/mm/mmu_context_nohash.c            |   12 +-
 arch/powerpc/mm/numa.c                          |  311 ++++++++++++++-
 arch/powerpc/mm/pgtable_32.c                    |    3 +-
 arch/powerpc/mm/pgtable_64.c                    |    2 +
 arch/powerpc/platforms/44x/Makefile             |    5 +-
 arch/powerpc/platforms/Kconfig                  |    7 +-
 arch/powerpc/platforms/cell/beat_iommu.c        |    3 +-
 arch/powerpc/platforms/cell/spufs/lscsa_alloc.c |    3 +-
 arch/powerpc/platforms/chrp/time.c              |    4 +
 arch/powerpc/platforms/iseries/mf.c             |   62 ---
 arch/powerpc/platforms/pasemi/iommu.c           |   19 +-
 arch/powerpc/platforms/powermac/setup.c         |    9 +
 arch/powerpc/platforms/pseries/Kconfig          |   10 +
 arch/powerpc/platforms/pseries/Makefile         |    1 +
 arch/powerpc/platforms/pseries/firmware.c       |    1 +
 arch/powerpc/platforms/pseries/hvCall.S         |    1 +
 arch/powerpc/platforms/pseries/iommu.c          |   49 +--
 arch/powerpc/platforms/pseries/lpar.c           |   12 +
 arch/powerpc/platforms/pseries/nvram.c          |  205 ++++++++++
 arch/powerpc/platforms/pseries/pseries_energy.c |  326 +++++++++++++++
 arch/powerpc/sysdev/Makefile                    |    1 +
 arch/powerpc/sysdev/dart_iommu.c                |    9 +-
 arch/powerpc/sysdev/mpc8xxx_gpio.c              |   75 ++++-
 arch/powerpc/sysdev/ppc4xx_cpm.c                |  346 ++++++++++++++++
 arch/powerpc/sysdev/tsi108_dev.c                |    8 +-
 drivers/char/hvc_vio.c                          |    2 +-
 drivers/dma/Kconfig                             |    2 +-
 drivers/dma/mpc512x_dma.c                       |  187 ++++++---
 drivers/macintosh/macio_asic.c                  |    7 +-
 drivers/macintosh/therm_pm72.c                  |   30 +--
 drivers/of/address.c                            |   54 ++--
 drivers/ps3/Makefile                            |    2 +-
 drivers/rtc/rtc-cmos.c                          |    3 +-
 include/linux/of_address.h                      |    6 +-
 91 files changed, 2103 insertions(+), 742 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/4xx/cpm.txt
 create mode 100644 arch/powerpc/lib/hweight_64.S
 create mode 100644 arch/powerpc/platforms/pseries/pseries_energy.c
 create mode 100644 arch/powerpc/sysdev/ppc4xx_cpm.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This is a small fix for a misuse of RCU on powerpc, please pull.

Cheers,
Ben.

The following changes since commit
72083646528d4887b920deb71b37e09bc7d227bb:

  Un-inline get_pipe_info() helper function (2010-11-28 16:27:19 -0800)

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

Peter Zijlstra (1):
      powerpc: Use call_rcu_sched() for pagetables

 arch/powerpc/mm/pgtable.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a handful of bug fixes and trivialities for powerpc for you
to pull.

Thanks !

Cheers,
Ben.

The following changes since commit 7957f0a857754c555e07f58a3fb83ac29501478c:
  Linus Torvalds (1):
        Fix build failure due to hwirq.h needing smp_lock.h

are available in the git repository at:

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

Alessio Igor Bogani (1):
      powerpc: Update a BKL related comment

Benjamin Herrenschmidt (1):
      powerpc: Fix div64 in bootloader

Kumar Gala (2):
      powerpc/mm: Fix build error in setup_initial_memory_limit
      powerpc/mm: Fix module instruction tlb fault handling on Book-E 64

Michael Neuling (1):
      powerpc: Fix call to subpage_protection()

Nishanth Aravamudan (1):
      powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG

kerstin jonsson (1):
      powerpc: Set CONFIG_32BIT on ppc32

 arch/powerpc/Kconfig                       |    4 ++++
 arch/powerpc/boot/div64.S                  |    3 ++-
 arch/powerpc/kernel/setup_64.c             |    5 ++---
 arch/powerpc/mm/hash_utils_64.c            |    2 +-
 arch/powerpc/mm/tlb_low_64e.S              |    5 ++++-
 arch/powerpc/mm/tlb_nohash.c               |    2 +-
 arch/powerpc/platforms/pseries/Kconfig     |    6 ++++++
 arch/powerpc/platforms/pseries/eeh.c       |    2 --
 arch/powerpc/platforms/pseries/pci_dlpar.c |    2 --
 9 files changed, 20 insertions(+), 11 deletions(-)

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

[Benjamin Herrenschmidt]

On Tue, 2010-08-31 at 15:56 +1000, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> Here's a few small fixes, one is an important fix for a nasty regression
> breaking pseries machine running under hypervisor... oops !

I updated this with some embedded fixed from Kumar and a fix for a new
deadlock in the pseries dlpar code.

New log below.

Cheers,
Ben.

The following changes since commit 2bfc96a127bc1cc94d26bfaa40159966064f9c8c:
  Linus Torvalds (1):
        Linux 2.6.36-rc3

are available in the git repository at:

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

Alexander Graf (1):
      powerpc/85xx: Fix compilation of mpc85xx_mds.c

Anton Vorontsov (1):
      powerpc/85xx: Add P1021 PCI IDs and quirks

Julia Lawall (2):
      arch/powerpc/platforms/83xx/mpc837x_mds.c: Add missing iounmap
      arch/powerpc/sysdev/qe_lib/qe.c: Add of_node_put to avoid memory leak

Kumar Gala (1):
      powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock

Li Yang (1):
      fsl_rio: fix compile errors

Matthew McClintock (1):
      powerpc/kexec: Adds correct calling convention for kexec purgatory

Michael Neuling (1):
      powerpc: Don't use kernel stack with translation off

Nathan Fontenot (1):
      powerpc/pseries: Correct rtas_data_buf locking in dlpar code

Paul Mackerras (1):
      powerpc/perf_event: Reduce latency of calling perf_event_do_pending

 arch/powerpc/kernel/head_64.S             |   12 ++++++--
 arch/powerpc/kernel/misc_32.S             |    3 ++
 arch/powerpc/kernel/time.c                |   23 +++++++--------
 arch/powerpc/platforms/83xx/mpc837x_mds.c |    9 ++++--
 arch/powerpc/platforms/85xx/mpc85xx_mds.c |    1 +
 arch/powerpc/platforms/85xx/p1022_ds.c    |    4 +-
 arch/powerpc/platforms/pseries/dlpar.c    |   42 ++++++++++++++++++++---------
 arch/powerpc/sysdev/fsl_pci.c             |    2 +
 arch/powerpc/sysdev/fsl_rio.c             |    6 +++-
 arch/powerpc/sysdev/qe_lib/qe.c           |    1 +
 include/linux/pci_ids.h                   |    2 +
 11 files changed, 71 insertions(+), 34 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a few small fixes, one is an important fix for a nasty regression
breaking pseries machine running under hypervisor... oops !

Cheers,
Ben.

The following changes since commit 2bfc96a127bc1cc94d26bfaa40159966064f9c8c:
  Linus Torvalds (1):
        Linux 2.6.36-rc3

are available in the git repository at:

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

Matthew McClintock (1):
      powerpc/kexec: Adds correct calling convention for kexec purgatory

Michael Neuling (1):
      powerpc: Don't use kernel stack with translation off

Paul Mackerras (1):
      powerpc/perf_event: Reduce latency of calling perf_event_do_pending

 arch/powerpc/kernel/head_64.S |   12 +++++++++---
 arch/powerpc/kernel/misc_32.S |    3 +++
 arch/powerpc/kernel/time.c    |   23 +++++++++++------------
 3 files changed, 23 insertions(+), 15 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a few powerpc bits & fixes for 2.6.36, some of them for some of
the new stuff that went in, along with the powerpc rwsem update to
atomic_long_t (not yet moved to asm-generic) and wiring up of some new
syscalls.

Cheers,
Ben.

The following changes since commit d1b113bb028999e82a8528e1484be8c23fb5a7d9:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

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

Anatolij Gustschin (1):
      powerpc: Fix typo in uImage target

Andreas Schwab (3):
      powerpc: Wire up fanotify_init, fanotify_mark, prlimit64 syscalls
      via-pmu: Add compat_pmu_ioctl
      powerpc: Fix config dependency problem with MPIC_U3_HT_IRQS

Anton Blanchard (4):
      powerpc/mm: Fix vsid_scrample typo
      powerpc/kdump: Stop all other CPUs before running crash handlers
      powerpc: Inline ppc64_runlatch_off
      powerpc: Fix bogus it_blocksize in VIO iommu code

Benjamin Herrenschmidt (2):
      Merge remote branch 'jwb/merge' into merge
      powerpc: Make rwsem use "long" type

Dave Kleikamp (4):
      powerpc/47x: Make sure mcsr is cleared before enabling machine check interrupts
      powerpc/47x: Remove redundant line from cputable.c
      powerpc/4xx: Index interrupt stacks by physical cpu
      powerpc/47x: Add an isync before the tlbivax instruction

Denis Kirjanov (1):
      powerpc: Use is_32bit_task() helper to test 32 bit binary

Grant Likely (1):
      powerpc/pci: Fix checking for child bridges in PCI code.

Julia Lawall (3):
      powerpc/powermac: Drop unnecessary of_node_put
      powerpc/powermac: Drop unnecessary null test
      powerpc/pci: Drop unnecessary null test

Matt Evans (1):
      powerpc: Initialise paca->kstack before early_setup_secondary

Nathan Fontenot (1):
      powerpc: Correct smt_enabled=X boot option for > 2 threads per core

Rupjyoti Sarmah (1):
      powerpc/4xx: Device tree update for the 460ex DWC SATA

Signed-off-by: Darren Hart (3):
      powerpc: Re-enable preemption before cpu_die()
      powerpc: Silence __cpu_up() under normal operation
      powerpc: Silence xics_migrate_irqs_away() during cpu offline

Sonny Rao (1):
      powerpc: Export memstart_addr and kernstart_addr on ppc64

 arch/powerpc/Makefile                     |    2 +-
 arch/powerpc/boot/dts/canyonlands.dts     |    8 ++++
 arch/powerpc/include/asm/mmu-hash64.h     |    2 +-
 arch/powerpc/include/asm/reg.h            |    9 ++++-
 arch/powerpc/include/asm/rwsem.h          |   64 +++++++++++++++++------------
 arch/powerpc/include/asm/systbl.h         |    3 +
 arch/powerpc/include/asm/unistd.h         |    5 ++-
 arch/powerpc/kernel/cputable.c            |    1 -
 arch/powerpc/kernel/crash.c               |   24 ++++++-----
 arch/powerpc/kernel/head_44x.S            |    4 ++
 arch/powerpc/kernel/head_64.S             |    6 +-
 arch/powerpc/kernel/idle.c                |    2 +-
 arch/powerpc/kernel/irq.c                 |   16 ++++---
 arch/powerpc/kernel/pci_of_scan.c         |    2 +-
 arch/powerpc/kernel/process.c             |   20 ++++-----
 arch/powerpc/kernel/setup_32.c            |    9 ++--
 arch/powerpc/kernel/setup_64.c            |   63 ++++++++++++++++------------
 arch/powerpc/kernel/smp.c                 |    4 +-
 arch/powerpc/kernel/sys_ppc32.c           |    8 ++++
 arch/powerpc/kernel/vio.c                 |    3 +-
 arch/powerpc/mm/init_64.c                 |    2 +
 arch/powerpc/mm/tlb_nohash_low.S          |    1 +
 arch/powerpc/platforms/Kconfig            |    3 +-
 arch/powerpc/platforms/cell/iommu.c       |    2 +-
 arch/powerpc/platforms/iseries/iommu.c    |    2 +-
 arch/powerpc/platforms/powermac/feature.c |    3 +-
 arch/powerpc/platforms/powermac/pci.c     |    2 -
 arch/powerpc/platforms/pseries/iommu.c    |    8 ++--
 arch/powerpc/platforms/pseries/smp.c      |   11 +++--
 arch/powerpc/platforms/pseries/xics.c     |    6 ++-
 drivers/macintosh/via-pmu.c               |   42 +++++++++++++++++++
 31 files changed, 219 insertions(+), 118 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a few things for 2.6.35.

One's a fallover from the lmb->memblock rename that I missed, which causes
a bunch of pseries machine to boot with 128M of memory and that's it :-)

There's a few patches fixing a nasty race we found in our hugepage code,
a kexec fix from Kumar, and an .lds fix from Sam for a bug that as far
as we know only affects powerpc.

Cheers,
Ben.

The following changes since commit b37fa16e78d6f9790462b3181602a26b5af36260:
  Linus Torvalds (1):
        Linux 2.6.35-rc6

are available in the git repository at:

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

Anton Blanchard (1):
      powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge

Benjamin Herrenschmidt (5):
      powerpc/mm: Move around testing of _PAGE_PRESENT in hash code
      powerpc/mm: Fix bugs in huge page hashing
      powerpc/mm: Add some debug output when hash insertion fails
      powerpc: Fix erroneous lmb->memblock conversions
      Merge commit 'kumar/merge' into merge

Kumar Gala (1):
      powerpc/kexec: Fix boundary case for book-e kexec memory limits

Sam Ravnborg (1):
      vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)

 arch/powerpc/include/asm/kexec.h                |    6 +-
 arch/powerpc/include/asm/mmu-hash64.h           |    4 +-
 arch/powerpc/kernel/prom.c                      |    2 +-
 arch/powerpc/mm/hash_low_64.S                   |    9 ----
 arch/powerpc/mm/hash_utils_64.c                 |   53 +++++++++++++++++------
 arch/powerpc/mm/hugetlbpage-hash64.c            |   40 +++++++++--------
 arch/powerpc/mm/numa.c                          |   24 +++++-----
 arch/powerpc/platforms/pseries/hotplug-memory.c |   22 +++++-----
 include/asm-generic/vmlinux.lds.h               |    2 +-
 9 files changed, 93 insertions(+), 69 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some late fixed for some freescale embedded platforms
for 2.6.35. A bit late but since it only touch their platform
code I don't really have an objection.

Cheers,
Ben.

The following changes since commit 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c:
  Linus Torvalds (1):
        Linux 2.6.35-rc5

are available in the git repository at:

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

Anton Vorontsov (3):
      powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)
      powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
      powerpc/cpm1: Mark micropatch code/data static and __init

Matthew McClintock (1):
      powerpc/fsl-booke: Fix address issue when using relocatable kernels

 arch/powerpc/include/asm/cpm.h                |   24 ++++++++++++++++++++
 arch/powerpc/include/asm/cpm1.h               |    3 +-
 arch/powerpc/kernel/fsl_booke_entry_mapping.S |    4 +--
 arch/powerpc/sysdev/micropatch.c              |   30 +++++++++++++++----------
 drivers/spi/spi_mpc8xxx.c                     |   22 ------------------
 5 files changed, 45 insertions(+), 38 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few powerpc nits and bits still for 2.6.35. Mostly simple/trivial
stuff and some gcc-4.5 related fixes.

Thanks !

Cheers,
Ben.

The following changes since commit 2aa72f612144a0a7d4b0b22ae7c122692ac6a013:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

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

Anton Blanchard (1):
      powerpc: Linux cannot run with 0 cores

Denis Kirjanov (1):
      powerpc/iseries: Fix possible null pointer dereference in iSeries_pcibios_fixup_resources

Johannes Berg (1):
      powerpc: Fix logic error in fixup_irqs

Matt Evans (1):
      powerpc/perf_event: Fix for power_pmu_disable()

Paul E. McKenney (1):
      powerpc: Fix default_machine_crash_shutdown #ifdef botch

Sam Ravnborg (1):
      powerpc: Fix userspace build of ptrace.h

Stephen Rothwell (3):
      powerpc: Fix module building for gcc 4.5 and 64 bit
      powerpc: Fix compile errors in prom_init_check for gcc 4.5
      powerpc: Fix feature-fixup tests for gcc 4.5

Yang Li (1):
      powerpc: Disable SPARSE_IRQ by default

 arch/powerpc/Kconfig                   |    4 +-
 arch/powerpc/Makefile                  |    4 +-
 arch/powerpc/include/asm/ptrace.h      |   32 ++++-----
 arch/powerpc/kernel/crash.c            |    2 +-
 arch/powerpc/kernel/irq.c              |    5 +-
 arch/powerpc/kernel/perf_event.c       |    5 +-
 arch/powerpc/kernel/prom_init.c        |    2 +-
 arch/powerpc/kernel/prom_init_check.sh |    6 ++
 arch/powerpc/lib/Makefile              |    4 +-
 arch/powerpc/lib/crtsavres.S           |  129 ++++++++++++++++++++++++++++++++
 arch/powerpc/lib/feature-fixups.c      |   17 ++--
 arch/powerpc/platforms/iseries/pci.c   |    6 +-
 scripts/mod/modpost.c                  |    5 +
 13 files changed, 184 insertions(+), 37 deletions(-)
 

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a reasonably urgent few bug fixes on top of -rc1. Grant OF stuff had
a few issues that broke pretty much all PowerMacs, so this fixes it, along
with a couple of misc fixes and a MAINTAINERS update.

Cheers,
Ben. 

The following changes since commit aef4b9aaae1decc775778903922bd0075cce7a88:
  Linus Torvalds (1):
        Merge branch 'next' of git://git.kernel.org/.../benh/powerpc

are available in the git repository at:

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

Ananth N Mavinakayanahalli (1):
      powerpc/kprobes: Remove resume_execution() in kprobes

Andreas Schwab (1):
      powerpc/macio: Don't dereference pointer before null check

Benjamin Herrenschmidt (1):
      powerpc/macio: Fix probing of macio devices by using the right of match table

Denis Kirjanov (1):
      powerpc/cell: Fix integer constant warning

Olof Johansson (1):
      powerpc/pasemi: Update MAINTAINERS file

Paul Mackerras (1):
      agp/uninorth: Fix oops caused by flushing too much

 MAINTAINERS                            |    3 +--
 arch/powerpc/include/asm/macio.h       |    4 ----
 arch/powerpc/kernel/kprobes.c          |   14 ++------------
 arch/powerpc/platforms/cell/iommu.c    |    2 +-
 drivers/ata/pata_macio.c               |   10 +++++-----
 drivers/block/swim3.c                  |    6 ++++--
 drivers/char/agp/uninorth-agp.c        |    2 +-
 drivers/ide/pmac.c                     |    7 +++++--
 drivers/macintosh/macio_asic.c         |    8 ++++----
 drivers/macintosh/mediabay.c           |    6 ++++--
 drivers/macintosh/rack-meter.c         |    8 +++++---
 drivers/net/bmac.c                     |    7 +++++--
 drivers/net/mace.c                     |    7 +++++--
 drivers/net/wireless/orinoco/airport.c |    7 +++++--
 drivers/scsi/mac53c94.c                |    7 +++++--
 drivers/scsi/mesh.c                    |    7 +++++--
 drivers/serial/pmac_zilog.c            |    7 +++++--
 sound/aoa/soundbus/i2sbus/core.c       |    8 +++++---
 18 files changed, 67 insertions(+), 53 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

I've added to my merge branch Kumar's swiotlb fix. Here's the updated
pull request.

Thanks !

Cheers,
Ben.

The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8:
  Linus Torvalds (1):
        Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      Merge commit 'kumar/merge' into merge

Kumar Gala (1):
      powerpc/swiotlb: Fix off by one in determining boundary of which ops to use

Paul Mackerras (1):
      powerpc/perf_event: Fix oops due to perf_event_do_pending call

 arch/powerpc/include/asm/hw_irq.h |   38 -----------------------
 arch/powerpc/kernel/asm-offsets.c |    1 -
 arch/powerpc/kernel/dma-swiotlb.c |    5 ++-
 arch/powerpc/kernel/entry_64.S    |    9 -----
 arch/powerpc/kernel/irq.c         |    6 ----
 arch/powerpc/kernel/time.c        |   60 +++++++++++++++++++++++++++++-------
 6 files changed, 51 insertions(+), 68 deletions(-)

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

[Benjamin Herrenschmidt]

On Wed, 2010-05-12 at 05:24 -0500, Kumar Gala wrote:

> Did where you going to also send linus:
> 
> http://patchwork.ozlabs.org/patch/51496/

Forgot about that one... I'll add it to the pile tomorrow.

Cheers,
Ben.

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

[Kumar Gala]

On May 12, 2010, at 2:46 AM, Benjamin Herrenschmidt wrote:

> Hi Linus !
> 
> Please pull this perf event fix from Paulus. Without it, using perf event
> can potentially oops the machine at any time.
> 
> Thanks !
> 
> Cheers,
> Ben.
> 
> The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8:
>  Linus Torvalds (1):
>        Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging
> 
> are available in the git repository at:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> 
> Paul Mackerras (1):
>      powerpc/perf_event: Fix oops due to perf_event_do_pending call
> 
> arch/powerpc/include/asm/hw_irq.h |   38 -----------------------
> arch/powerpc/kernel/asm-offsets.c |    1 -
> arch/powerpc/kernel/entry_64.S    |    9 -----
> arch/powerpc/kernel/irq.c         |    6 ----
> arch/powerpc/kernel/time.c        |   60 +++++++++++++++++++++++++++++-------
> 5 files changed, 48 insertions(+), 66 deletions(-)
> 

Ben,

Did where you going to also send linus:

http://patchwork.ozlabs.org/patch/51496/

- k

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Please pull this perf event fix from Paulus. Without it, using perf event
can potentially oops the machine at any time.

Thanks !

Cheers,
Ben.

The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8:
  Linus Torvalds (1):
        Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

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

Paul Mackerras (1):
      powerpc/perf_event: Fix oops due to perf_event_do_pending call

 arch/powerpc/include/asm/hw_irq.h |   38 -----------------------
 arch/powerpc/kernel/asm-offsets.c |    1 -
 arch/powerpc/kernel/entry_64.S    |    9 -----
 arch/powerpc/kernel/irq.c         |    6 ----
 arch/powerpc/kernel/time.c        |   60 +++++++++++++++++++++++++++++-------
 5 files changed, 48 insertions(+), 66 deletions(-)

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

[Benjamin Herrenschmidt]

On Tue, 2010-04-27 at 15:56 +1000, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> PowerPC has been a bit quiet this time around :-) That is until Kumar
> woke me up with a few fixes and defconfig updates for the freescale
> embedded platforms.

I added a few patches to that. Some ps3 defconfig & maintainers change
and a couple of nasty bug fixes.

Here's an updated request.

Cheers,
Ben.

The following changes since commit b91ce4d14a21fc04d165be30319541e0f9204f15:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

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

Anton Blanchard (1):
      powerpc/numa: Add form 1 NUMA affinity

Anton Vorontsov (1):
      powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n

Becky Bruce (1):
      powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS

Benjamin Herrenschmidt (1):
      powerpc/pseries: Flush lazy kernel mappings after unplug operations

Geoff Levand (2):
      powerpc/ps3: Update platform maintainer
      powerpc/ps3: Update ps3_defconfig

Kim Phillips (4):
      powerpc/83xx: add RTC drivers in 83xx defconfig
      powerpc/83xx: enable EPOLL syscall in defconfig
      powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig
      powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED

Kumar Gala (2):
      powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
      powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32

Wolfgang Ocker (1):
      powerpc/fsl-cpm: Configure clock correctly for SCC

 MAINTAINERS                                       |    8 +-
 arch/powerpc/configs/83xx/asp8347_defconfig       |   44 +++---
 arch/powerpc/configs/83xx/kmeter1_defconfig       |   28 ++--
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |   49 +++---
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |   50 +++---
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |   45 +++---
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |   49 +++---
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |   44 +++---
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |   43 +++---
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |   46 +++---
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |   45 +++---
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |   44 +++--
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |   46 +++---
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |   51 +++---
 arch/powerpc/configs/83xx/sbc834x_defconfig       |   44 +++---
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   23 ++-
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   25 ++-
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   34 +++--
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   31 +++--
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   31 +++--
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   25 ++-
 arch/powerpc/configs/85xx/socrates_defconfig      |   51 ++++---
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |   51 ++++---
 arch/powerpc/configs/85xx/tqm8540_defconfig       |   48 +++--
 arch/powerpc/configs/85xx/tqm8541_defconfig       |   54 ++++--
 arch/powerpc/configs/85xx/tqm8548_defconfig       |   47 +++--
 arch/powerpc/configs/85xx/tqm8555_defconfig       |   54 ++++--
 arch/powerpc/configs/85xx/tqm8560_defconfig       |   54 ++++--
 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig   |   59 +++++--
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig     |  102 +++++++-----
 arch/powerpc/configs/86xx/gef_sbc310_defconfig    |   53 ++++---
 arch/powerpc/configs/86xx/gef_sbc610_defconfig    |   96 +++++++----
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig  |   34 ++--
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig  |   48 ++++--
 arch/powerpc/configs/86xx/sbc8641d_defconfig      |   40 +++--
 arch/powerpc/configs/adder875_defconfig           |   18 +-
 arch/powerpc/configs/c2k_defconfig                |   55 +++----
 arch/powerpc/configs/ep8248e_defconfig            |   20 ++-
 arch/powerpc/configs/ep88xc_defconfig             |   17 +-
 arch/powerpc/configs/linkstation_defconfig        |   48 +++--
 arch/powerpc/configs/mgcoge_defconfig             |   31 +++-
 arch/powerpc/configs/mgsuvd_defconfig             |   19 ++-
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |   26 ++-
 arch/powerpc/configs/mpc8272_ads_defconfig        |   23 ++-
 arch/powerpc/configs/mpc83xx_defconfig            |  124 +++++++++++---
 arch/powerpc/configs/mpc85xx_defconfig            |   62 +++++---
 arch/powerpc/configs/mpc85xx_smp_defconfig        |   64 +++++---
 arch/powerpc/configs/mpc866_ads_defconfig         |   20 +-
 arch/powerpc/configs/mpc86xx_defconfig            |   57 ++++---
 arch/powerpc/configs/mpc885_ads_defconfig         |   20 +-
 arch/powerpc/configs/pq2fads_defconfig            |   22 ++-
 arch/powerpc/configs/prpmc2800_defconfig          |   52 ++++--
 arch/powerpc/configs/ps3_defconfig                |  189 ++++++++++++++-------
 arch/powerpc/configs/storcenter_defconfig         |   33 ++--
 arch/powerpc/include/asm/page.h                   |   15 ++-
 arch/powerpc/kernel/prom_init.c                   |    3 +-
 arch/powerpc/mm/fsl_booke_mmu.c                   |    4 +-
 arch/powerpc/mm/numa.c                            |   17 ++-
 arch/powerpc/platforms/85xx/Kconfig               |    4 +-
 arch/powerpc/platforms/86xx/Kconfig               |    4 +-
 arch/powerpc/platforms/pseries/hotplug-memory.c   |    7 +
 arch/powerpc/sysdev/cpm1.c                        |   14 ++-
 arch/powerpc/sysdev/cpm2.c                        |   11 +-
 drivers/pci/hotplug/rpadlpar_core.c               |    3 +
 drivers/pci/hotplug/rpaphp_core.c                 |    3 +
 65 files changed, 1609 insertions(+), 972 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

PowerPC has been a bit quiet this time around :-) That is until Kumar
woke me up with a few fixes and defconfig updates for the freescale
embedded platforms.

Cheers,
Ben.

The following changes since commit b91ce4d14a21fc04d165be30319541e0f9204f15:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

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

Anton Vorontsov (1):
      powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n

Becky Bruce (1):
      powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS

Kim Phillips (4):
      powerpc/83xx: add RTC drivers in 83xx defconfig
      powerpc/83xx: enable EPOLL syscall in defconfig
      powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig
      powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED

Kumar Gala (2):
      powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
      powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32

Wolfgang Ocker (1):
      powerpc/fsl-cpm: Configure clock correctly for SCC

 arch/powerpc/configs/83xx/asp8347_defconfig       |   44 ++++----
 arch/powerpc/configs/83xx/kmeter1_defconfig       |   28 +++--
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |   49 +++++----
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |   50 +++++----
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |   45 ++++----
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |   49 ++++----
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |   44 ++++----
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |   43 ++++----
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |   46 +++++----
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |   45 ++++----
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |   44 ++++---
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |   46 +++++----
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |   51 +++++----
 arch/powerpc/configs/83xx/sbc834x_defconfig       |   44 ++++----
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   23 +++-
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   25 +++--
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   34 ++++--
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   31 ++++--
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   31 ++++--
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   25 +++--
 arch/powerpc/configs/85xx/socrates_defconfig      |   51 +++++----
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |   51 +++++----
 arch/powerpc/configs/85xx/tqm8540_defconfig       |   48 +++++---
 arch/powerpc/configs/85xx/tqm8541_defconfig       |   54 ++++++---
 arch/powerpc/configs/85xx/tqm8548_defconfig       |   47 +++++---
 arch/powerpc/configs/85xx/tqm8555_defconfig       |   54 ++++++---
 arch/powerpc/configs/85xx/tqm8560_defconfig       |   54 ++++++---
 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig   |   59 +++++++---
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig     |  102 +++++++++++-------
 arch/powerpc/configs/86xx/gef_sbc310_defconfig    |   53 ++++++----
 arch/powerpc/configs/86xx/gef_sbc610_defconfig    |   96 +++++++++++------
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig  |   34 +++---
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig  |   48 +++++---
 arch/powerpc/configs/86xx/sbc8641d_defconfig      |   40 ++++---
 arch/powerpc/configs/adder875_defconfig           |   18 ++--
 arch/powerpc/configs/c2k_defconfig                |   55 ++++-----
 arch/powerpc/configs/ep8248e_defconfig            |   20 +++-
 arch/powerpc/configs/ep88xc_defconfig             |   17 ++--
 arch/powerpc/configs/linkstation_defconfig        |   48 +++++---
 arch/powerpc/configs/mgcoge_defconfig             |   31 ++++--
 arch/powerpc/configs/mgsuvd_defconfig             |   19 ++--
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |   26 +++--
 arch/powerpc/configs/mpc8272_ads_defconfig        |   23 +++-
 arch/powerpc/configs/mpc83xx_defconfig            |  124 ++++++++++++++++-----
 arch/powerpc/configs/mpc85xx_defconfig            |   62 +++++++----
 arch/powerpc/configs/mpc85xx_smp_defconfig        |   64 +++++++----
 arch/powerpc/configs/mpc866_ads_defconfig         |   20 ++--
 arch/powerpc/configs/mpc86xx_defconfig            |   57 ++++++----
 arch/powerpc/configs/mpc885_ads_defconfig         |   20 ++--
 arch/powerpc/configs/pq2fads_defconfig            |   22 +++-
 arch/powerpc/configs/prpmc2800_defconfig          |   52 ++++++---
 arch/powerpc/configs/storcenter_defconfig         |   33 +++---
 arch/powerpc/include/asm/page.h                   |   15 +++-
 arch/powerpc/mm/fsl_booke_mmu.c                   |    4 +-
 arch/powerpc/platforms/85xx/Kconfig               |    4 +-
 arch/powerpc/platforms/86xx/Kconfig               |    4 +-
 arch/powerpc/sysdev/cpm1.c                        |   14 ++-
 arch/powerpc/sysdev/cpm2.c                        |   11 ++-
 58 files changed, 1446 insertions(+), 905 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a handful of powerpc fixes for 2.6.34, along with a patch
from Fujita Tomonori to remove a config option that is mostly
useless nowadays.

Cheers,
Ben.

The following changes since commit 39710479303fd3affb3e204e9a7a75cc676977b5:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../vapier/blackfin

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      Merge commit 'kumar/merge' into merge

FUJITA Tomonori (2):
      powerpc: Fix swiotlb to respect the boot option
      powerpc: Remove IOMMU_VMERGE config option

Kumar Gala (2):
      powerpc/85xx: Make sure lwarx hint isn't set on ppc32
      powerpc/fsl-booke: Get coherent bit from PTE

Márton Németh (1):
      powerpc: Do not call prink when CONFIG_PRINTK is not defined

Nathan Lynch (1):
      powerpc: Use correct ccr bit for syscall error status

 arch/powerpc/Kconfig                  |   13 -------------
 arch/powerpc/include/asm/ppc-opcode.h |    6 +++---
 arch/powerpc/include/asm/syscall.h    |    6 +++---
 arch/powerpc/kernel/head_fsl_booke.S  |    7 ++++---
 arch/powerpc/kernel/iommu.c           |    7 +------
 arch/powerpc/kernel/setup_32.c        |    6 ------
 arch/powerpc/kernel/setup_64.c        |    6 ------
 arch/powerpc/mm/mem.c                 |    6 ++++++
 8 files changed, 17 insertions(+), 40 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Ideally this should have reached you earlier last week but I was
bogged down in meetings and then away on an extended week-end.

It's mostly a few bug fixes, some trivial raw spinlock conversions,
and a couple of "features" that I didn't have in my previous merge
request for all the wrong reasons, which are the e500 perf support
and the dynamic PACA stuff from Michael.

Cheers,
Ben.

The following changes since commit 57d54889cd00db2752994b389ba714138652e60c:
  Linus Torvalds (1):
        Linux 2.6.34-rc1

are available in the git repository at:

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

Adam Lackorzynski (1):
      powerpc: Fix SMP build with disabled CPU hotplugging.

Andrea Gelmini (1):
      powerpc/cpm2: Checkpatch cleanup

Anton Vorontsov (4):
      powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock
      powerpc/82xx: Convert pci_pic_lock to raw_spinlock
      powerpc/qe: Convert qe_ic_lock to raw_spinlock
      powerpc/86xx: Convert gef_pic_lock to raw_spinlock

Benjamin Herrenschmidt (1):
      Merge commit 'kumar/next' into merge

Dave Kleikamp (2):
      powerpc/booke: Fix a couple typos in the advanced ptrace code
      powerpc/booke: Fix breakpoint/watchpoint one-shot behavior

Josh Boyer (1):
      powerpc: Fix G5 thermal shutdown

Mark Nelson (1):
      powerpc/pseries: Pass CPPR value to H_XIRR hcall

Martyn Welch (1):
      powerpc/86xx: Renaming following split of GE Fanuc joint venture

Michael Ellerman (1):
      powerpc: Dynamically allocate pacas

Scott Wood (2):
      powerpc/perf: Build callchain code regardless of hardware event support.
      powerpc/perf: e500 support

Vaidyanathan Srinivasan (3):
      powerpc: Reset kernel stack on cpu online from cede state
      powerpc: Move checks in pseries_mach_cpu_die()
      powerpc: Reduce printk from pseries_mach_cpu_die()

 arch/powerpc/boot/dts/gef_ppc9a.dts             |    4 +-
 arch/powerpc/boot/dts/gef_sbc310.dts            |    4 +-
 arch/powerpc/boot/dts/gef_sbc610.dts            |    4 +-
 arch/powerpc/include/asm/paca.h                 |   18 +-
 arch/powerpc/include/asm/perf_event.h           |  109 +----
 arch/powerpc/include/asm/perf_event_fsl_emb.h   |   50 ++
 arch/powerpc/include/asm/perf_event_server.h    |  110 ++++
 arch/powerpc/include/asm/reg_booke.h            |    4 +-
 arch/powerpc/include/asm/reg_fsl_emb.h          |    2 +-
 arch/powerpc/kernel/Makefile                    |    7 +-
 arch/powerpc/kernel/cputable.c                  |    2 +-
 arch/powerpc/kernel/e500-pmu.c                  |  129 +++++
 arch/powerpc/kernel/head_64.S                   |   17 +-
 arch/powerpc/kernel/paca.c                      |   93 +++-
 arch/powerpc/kernel/perf_event_fsl_emb.c        |  654 +++++++++++++++++++++++
 arch/powerpc/kernel/prom.c                      |    3 +
 arch/powerpc/kernel/ptrace.c                    |   12 +-
 arch/powerpc/kernel/setup-common.c              |    3 +
 arch/powerpc/kernel/setup_64.c                  |   12 +-
 arch/powerpc/platforms/82xx/pq2ads-pci-pic.c    |   10 +-
 arch/powerpc/platforms/85xx/socrates_fpga_pic.c |   34 +-
 arch/powerpc/platforms/86xx/Kconfig             |   12 +-
 arch/powerpc/platforms/86xx/gef_gpio.c          |   10 +-
 arch/powerpc/platforms/86xx/gef_pic.c           |   20 +-
 arch/powerpc/platforms/86xx/gef_ppc9a.c         |   12 +-
 arch/powerpc/platforms/86xx/gef_sbc310.c        |   12 +-
 arch/powerpc/platforms/86xx/gef_sbc610.c        |   12 +-
 arch/powerpc/platforms/Kconfig.cputype          |   10 +
 arch/powerpc/platforms/iseries/exception.S      |   25 +-
 arch/powerpc/platforms/pseries/hotplug-cpu.c    |   42 +-
 arch/powerpc/platforms/pseries/offline_states.h |   23 +-
 arch/powerpc/platforms/pseries/plpar_wrappers.h |    4 +-
 arch/powerpc/platforms/pseries/xics.c           |    7 +-
 arch/powerpc/sysdev/cpm2_pic.h                  |    2 +-
 arch/powerpc/sysdev/qe_lib/qe_ic.c              |   10 +-
 drivers/macintosh/therm_pm72.c                  |   30 +-
 drivers/macintosh/therm_pm72.h                  |    2 +-
 37 files changed, 1250 insertions(+), 264 deletions(-)
 create mode 100644 arch/powerpc/include/asm/perf_event_fsl_emb.h
 create mode 100644 arch/powerpc/include/asm/perf_event_server.h
 create mode 100644 arch/powerpc/kernel/e500-pmu.c
 create mode 100644 arch/powerpc/kernel/perf_event_fsl_emb.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a fix for a nasty regression that went in this release cycle
and breaks 64K pages on HW that only does 4K such as 970's.

Cheers,
Ben.

The following changes since commit ac73fddfc523bf3c3525d16356b44527c44fae6d:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://neil.brown.name/md

are available in the git repository at:

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

David Gibson (1):
      powerpc: Fix address masking bug in hpte_need_flush()

 arch/powerpc/mm/tlb_hash64.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a small regression fix that should still make it into .33

Cheers,
Ben.

The following changes since commit 6339204ecc2aa2067a99595522de0403f0854bb8:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs-2.6

are available in the git repository at:

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

Mark Nelson (1):
      powerpc/pseries: Fix kexec regression caused by CPPR tracking

 arch/powerpc/platforms/pseries/xics.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

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

[Benjamin Herrenschmidt]

On Sun, 2010-01-31 at 10:34 +1100, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> Here are some more defconfig updates that I missed before LCA and a
> few PCI related fixes, some of them actually fixing regressions and
> one of them (the 4xx one) trivial enough that's really not worth
> delaying it.

I've just added 2 commits. One is the powerpc version of the
TIF_ABI_PENDING bit removal (thanks Andreas ! I love it when people do
my work for me :-) and the other one is a small compile fix (a
regression fix actually).

New log below.

Cheers,
Ben.

The following changes since commit b04da8bfdfbbd79544cab2fadfdc12e87eb01600:
  Greg Kroah-Hartman (1):
        fnctl: f_modown should call write_lock_irqsave/restore

are available in the git repository at:

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

Andreas Schwab (1):
      powerpc: TIF_ABI_PENDING bit removal

Benjamin Herrenschmidt (5):
      powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()
      powerpc/pci: Add missing hookup to pci_slot
      powerpc/pci: Add missing call to header fixup
      Merge commit 'jwb/merge' into merge
      powerpc/pseries: Fix xics build without CONFIG_SMP

Josh Boyer (2):
      powerpc/44x: Update PowerPC 44x board defconfigs
      powerpc/40x: Update the PowerPC 40x board defconfigs

Stef van Os (1):
      powerpc/4xx: Add pcix type 1 transactions

 arch/powerpc/configs/40x/acadia_defconfig      |  241 ++++++++++++++-----
 arch/powerpc/configs/40x/ep405_defconfig       |  307 ++++++++++++++++++------
 arch/powerpc/configs/40x/hcu4_defconfig        |  256 +++++++++++++++-----
 arch/powerpc/configs/40x/kilauea_defconfig     |  140 ++++++++---
 arch/powerpc/configs/40x/makalu_defconfig      |  190 ++++++++++-----
 arch/powerpc/configs/40x/walnut_defconfig      |  257 +++++++++++++++-----
 arch/powerpc/configs/44x/arches_defconfig      |  135 ++++++++---
 arch/powerpc/configs/44x/bamboo_defconfig      |  255 +++++++++++++++-----
 arch/powerpc/configs/44x/canyonlands_defconfig |  141 ++++++++---
 arch/powerpc/configs/44x/ebony_defconfig       |  258 +++++++++++++++-----
 arch/powerpc/configs/44x/eiger_defconfig       |  128 +++++++---
 arch/powerpc/configs/44x/katmai_defconfig      |  253 +++++++++++++++-----
 arch/powerpc/configs/44x/rainier_defconfig     |  254 +++++++++++++++-----
 arch/powerpc/configs/44x/redwood_defconfig     |  274 +++++++++++++++------
 arch/powerpc/configs/44x/sam440ep_defconfig    |  284 +++++++++++++++-------
 arch/powerpc/configs/44x/sequoia_defconfig     |  202 +++++++++++-----
 arch/powerpc/configs/44x/taishan_defconfig     |  258 +++++++++++++++-----
 arch/powerpc/configs/44x/warp_defconfig        |  228 ++++++++++++------
 arch/powerpc/configs/ppc40x_defconfig          |  292 ++++++++++++++++-------
 arch/powerpc/configs/ppc44x_defconfig          |  309 +++++++++++++++++-------
 arch/powerpc/include/asm/elf.h                 |    8 +-
 arch/powerpc/include/asm/thread_info.h         |    2 -
 arch/powerpc/kernel/pci_of_scan.c              |   10 +
 arch/powerpc/kernel/process.c                  |   12 -
 arch/powerpc/platforms/pseries/xics.c          |    6 +-
 arch/powerpc/sysdev/ppc4xx_pci.c               |    3 +-
 drivers/pci/probe.c                            |    4 +-
 include/linux/pci.h                            |    4 +
 28 files changed, 3412 insertions(+), 1299 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some more defconfig updates that I missed before LCA and a
few PCI related fixes, some of them actually fixing regressions and
one of them (the 4xx one) trivial enough that's really not worth
delaying it.

Cheers,
Ben.

The following changes since commit b04da8bfdfbbd79544cab2fadfdc12e87eb01600:
  Greg Kroah-Hartman (1):
        fnctl: f_modown should call write_lock_irqsave/restore

are available in the git repository at:

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

Benjamin Herrenschmidt (4):
      powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()
      powerpc/pci: Add missing hookup to pci_slot
      powerpc/pci: Add missing call to header fixup
      Merge commit 'jwb/merge' into merge

Josh Boyer (2):
      powerpc/44x: Update PowerPC 44x board defconfigs
      powerpc/40x: Update the PowerPC 40x board defconfigs

Stef van Os (1):
      powerpc/4xx: Add pcix type 1 transactions

 arch/powerpc/configs/40x/acadia_defconfig      |  241 ++++++++++++++-----
 arch/powerpc/configs/40x/ep405_defconfig       |  307 ++++++++++++++++++------
 arch/powerpc/configs/40x/hcu4_defconfig        |  256 +++++++++++++++-----
 arch/powerpc/configs/40x/kilauea_defconfig     |  140 ++++++++---
 arch/powerpc/configs/40x/makalu_defconfig      |  190 ++++++++++-----
 arch/powerpc/configs/40x/walnut_defconfig      |  257 +++++++++++++++-----
 arch/powerpc/configs/44x/arches_defconfig      |  135 ++++++++---
 arch/powerpc/configs/44x/bamboo_defconfig      |  255 +++++++++++++++-----
 arch/powerpc/configs/44x/canyonlands_defconfig |  141 ++++++++---
 arch/powerpc/configs/44x/ebony_defconfig       |  258 +++++++++++++++-----
 arch/powerpc/configs/44x/eiger_defconfig       |  128 +++++++---
 arch/powerpc/configs/44x/katmai_defconfig      |  253 +++++++++++++++-----
 arch/powerpc/configs/44x/rainier_defconfig     |  254 +++++++++++++++-----
 arch/powerpc/configs/44x/redwood_defconfig     |  274 +++++++++++++++------
 arch/powerpc/configs/44x/sam440ep_defconfig    |  284 +++++++++++++++-------
 arch/powerpc/configs/44x/sequoia_defconfig     |  202 +++++++++++-----
 arch/powerpc/configs/44x/taishan_defconfig     |  258 +++++++++++++++-----
 arch/powerpc/configs/44x/warp_defconfig        |  228 ++++++++++++------
 arch/powerpc/configs/ppc40x_defconfig          |  292 ++++++++++++++++-------
 arch/powerpc/configs/ppc44x_defconfig          |  309 +++++++++++++++++-------
 arch/powerpc/kernel/pci_of_scan.c              |   10 +
 arch/powerpc/sysdev/ppc4xx_pci.c               |    3 +-
 drivers/pci/probe.c                            |    4 +-
 include/linux/pci.h                            |    4 +
 24 files changed, 3409 insertions(+), 1274 deletions(-)

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

[Benjamin Herrenschmidt]

On Mon, 2010-01-18 at 07:32 -0500, Josh Boyer wrote:
> You missed my defconfig updates.  I sent you a pull request 2 weeks
> ago.
> 
> http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-January/079309.html
> 
> Those are still sitting in that tree on that branch if someone wanted
> to pull
> them directly. 

That's ok, it's just defconfigs, I"ll send another pull request after
Linus is done with the current one.

Sorry about that.

Jeremy: We need patchwork to track pull requests :-)

Cheers,
Ben.

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

[Josh Boyer]

On Mon, Jan 18, 2010 at 05:45:48PM +1100, Benjamin Herrenschmidt wrote:
>Hi Linus !
>
>A tad late due to me slacking and leaving the patches take dust in
>patchwork for a bit too long, but here are a few bug fixes for powerpc
>and a bunch of defconfig freshen ups for some of our embedded platforms.

You missed my defconfig updates.  I sent you a pull request 2 weeks ago.

http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-January/079309.html

Those are still sitting in that tree on that branch if someone wanted to pull
them directly.

josh

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

A tad late due to me slacking and leaving the patches take dust in
patchwork for a bit too long, but here are a few bug fixes for powerpc
and a bunch of defconfig freshen ups for some of our embedded platforms.

Cheers,
Ben.

The following changes since commit 004b35063296b6772fa72404a35b498f1e71e87e:
  Linus Torvalds (1):
        Merge branch 'drm-linus' of git://git.kernel.org/.../airlied/drm-2.6

are available in the git repository at:

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

Anton Blanchard (2):
      powerpc/pseries: Fix xics interrupt affinity
      powerpc: cpumask_of_node() should handle -1 as a node

Anton Vorontsov (1):
      powerpc/swsusp_32: Fix TLB invalidation

Benjamin Herrenschmidt (3):
      serial/pmac_zilog: Workaround problem due to interrupt on closed port
      Merge commit 'kumar/merge' into merge
      Merge commit 'gcl/merge' into merge

FUJITA Tomonori (1):
      powerpc/pseries: Fix dlpar compile warning without CONFIG_PROC_DEVICETREE

Grant Likely (1):
      powerpc/5200: update defconfigs

Jiri Slaby (1):
      powerpc: Use helpers for rlimits

Joakim Tjernlund (2):
      powerpc/8xx: Always pin kernel instruction TLB
      powerpc/8xx: Fix user space TLB walk in dcbX fixup

Kamalesh Babulal (1):
      powerpc/hvc: Driver build breaks with !HVC_CONSOLE

Kumar Gala (1):
      powerpc: 2.6.33 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx

Michael Ellerman (1):
      powerpc/iseries: Initialise on-stack completion

Márton Németh (1):
      powerpc/macintosh: Make Open Firmware device id constant

Nathan Fontenot (2):
      powerpc: Move /proc/ppc64 to /proc/powerpc update
      powerpc: Move cpu hotplug driver lock from pseries to powerpc

Peter Tyser (1):
      powerpc: Use scripts/mkuboot.sh instead of 'mkimage'

Stefan Roese (1):
      powerpc: Fix decrementer setup on 1GHz boards

 arch/powerpc/boot/wrapper                         |    7 +-
 arch/powerpc/configs/52xx/cm5200_defconfig        |   75 ++++++++++++---
 arch/powerpc/configs/52xx/lite5200b_defconfig     |   90 ++++++++++++++----
 arch/powerpc/configs/52xx/motionpro_defconfig     |   79 +++++++++++++---
 arch/powerpc/configs/52xx/pcm030_defconfig        |   83 +++++++++++++----
 arch/powerpc/configs/52xx/tqm5200_defconfig       |   79 +++++++++++++---
 arch/powerpc/configs/83xx/asp8347_defconfig       |   88 +++++++++++++-----
 arch/powerpc/configs/83xx/kmeter1_defconfig       |   68 +++++++++++---
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |   97 +++++++++++++++-----
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |  100 +++++++++++++++-----
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |   89 +++++++++++++-----
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |   93 ++++++++++++++-----
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |   95 ++++++++++++++-----
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |   92 ++++++++++++++-----
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |   86 +++++++++++++-----
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |   89 +++++++++++++-----
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |   87 +++++++++++++-----
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |   89 +++++++++++++-----
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |   91 +++++++++++++-----
 arch/powerpc/configs/83xx/sbc834x_defconfig       |   85 ++++++++++++-----
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   69 ++++++++++---
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   69 ++++++++++---
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   76 ++++++++++++----
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   75 +++++++++++----
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   77 ++++++++++++----
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   72 +++++++++++---
 arch/powerpc/configs/85xx/socrates_defconfig      |   99 +++++++++++++++-----
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |   87 +++++++++++++-----
 arch/powerpc/configs/85xx/tqm8540_defconfig       |   89 +++++++++++++-----
 arch/powerpc/configs/85xx/tqm8541_defconfig       |   90 +++++++++++++-----
 arch/powerpc/configs/85xx/tqm8548_defconfig       |   95 ++++++++++++++----
 arch/powerpc/configs/85xx/tqm8555_defconfig       |   90 +++++++++++++-----
 arch/powerpc/configs/85xx/tqm8560_defconfig       |   90 +++++++++++++-----
 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig   |  103 ++++++++++++++++----
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig     |  102 ++++++++++++++++----
 arch/powerpc/configs/86xx/gef_sbc310_defconfig    |   99 ++++++++++++++++----
 arch/powerpc/configs/86xx/gef_sbc610_defconfig    |   92 ++++++++++++++----
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig  |   88 +++++++++++++----
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig  |   90 ++++++++++++++----
 arch/powerpc/configs/86xx/sbc8641d_defconfig      |   81 ++++++++++++----
 arch/powerpc/configs/adder875_defconfig           |   57 +++++++++---
 arch/powerpc/configs/c2k_defconfig                |   90 +++++++++++++-----
 arch/powerpc/configs/ep8248e_defconfig            |   64 ++++++++++---
 arch/powerpc/configs/ep88xc_defconfig             |   55 +++++++++---
 arch/powerpc/configs/linkstation_defconfig        |   96 ++++++++++++++-----
 arch/powerpc/configs/mgcoge_defconfig             |   74 +++++++++++----
 arch/powerpc/configs/mgsuvd_defconfig             |   63 ++++++++++---
 arch/powerpc/configs/mpc5200_defconfig            |  106 +++++++++++++++++----
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |   79 ++++++++++++----
 arch/powerpc/configs/mpc8272_ads_defconfig        |   70 +++++++++++---
 arch/powerpc/configs/mpc83xx_defconfig            |   92 +++++++++++++-----
 arch/powerpc/configs/mpc85xx_defconfig            |   97 ++++++++++++++-----
 arch/powerpc/configs/mpc85xx_smp_defconfig        |   97 ++++++++++++++-----
 arch/powerpc/configs/mpc866_ads_defconfig         |   65 ++++++++++---
 arch/powerpc/configs/mpc86xx_defconfig            |   93 ++++++++++++++----
 arch/powerpc/configs/mpc885_ads_defconfig         |   55 +++++++++---
 arch/powerpc/configs/pq2fads_defconfig            |   72 +++++++++++---
 arch/powerpc/configs/prpmc2800_defconfig          |   94 ++++++++++++++-----
 arch/powerpc/configs/storcenter_defconfig         |   86 +++++++++++++----
 arch/powerpc/include/asm/topology.h               |    4 +-
 arch/powerpc/kernel/head_8xx.S                    |   12 +-
 arch/powerpc/kernel/rtas-proc.c                   |   14 ++--
 arch/powerpc/kernel/smp.c                         |   12 +++
 arch/powerpc/kernel/swsusp_32.S                   |    2 +-
 arch/powerpc/kernel/time.c                        |   11 ++-
 arch/powerpc/mm/mmap_64.c                         |    4 +-
 arch/powerpc/platforms/cell/spufs/coredump.c      |    2 +-
 arch/powerpc/platforms/iseries/vio.c              |    2 +
 arch/powerpc/platforms/pseries/dlpar.c            |   18 +---
 arch/powerpc/platforms/pseries/xics.c             |   12 +-
 drivers/char/Kconfig                              |    2 +-
 drivers/macintosh/smu.c                           |    2 +-
 drivers/macintosh/therm_pm72.c                    |    2 +-
 drivers/macintosh/therm_windtunnel.c              |    2 +-
 drivers/serial/pmac_zilog.c                       |   11 ++
 75 files changed, 3837 insertions(+), 1175 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some powerpc leftovers from the merge window. Mostly fixes,
plus a few embedded things that I didn't pull from Kumar in time.

Cheers,
Ben.

The following changes since commit 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f:
  Linus Torvalds (1):
        Linux 2.6.33-rc1

are available in the git repository at:

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

Albert Herranz (3):
      powerpc/gamecube/wii: Fix off-by-one error in ugecon/usbgecko_udbg
      powerpc/gc/wii: hlwd-pic: convert irq_desc.lock to raw_spinlock
      powerpc/gc/wii: Remove get_irq_desc()

Alexey Dobriyan (1):
      powerpc/iseries: Convert to proc_fops

Anatolij Gustschin (1):
      powerpc/44x: Extend Katmai dts for ADMA and RAID56 support

Anton Blanchard (3):
      powerpc/defconfigs: Reduce 64bit vmlinux by making acenic and cramfs modules
      powerpc/defconfigs: Disable token ring in powerpc defconfigs
      powerpc/defconfigs: Set HZ=100 on pseries and ppc64 defconfigs

Anton Vorontsov (4):
      powerpc/fsl_pci: Fix P2P bridge handling for MPC83xx PCIe controllers
      powerpc/83xx/suspend: Clear deep_sleeping after devices resume
      powerpc/83xx/suspend: Save and restore SICRL, SICRH and SCCR
      powerpc/83xx: Add power management support for MPC8315E-RDB boards

Benjamin Herrenschmidt (4):
      powerpc/mm: Fix a WARN_ON() with CONFIG_DEBUG_PAGEALLOC and CONFIG_DEBUG_VM
      powerpc: Fix MSI support on U4 bridge PCIe slot
      Merge commit 'kumar/next' into merge
      Merge commit 'jwb/next' into merge

David Daney (1):
      powerpc: Convert BUG() to use unreachable()

David Gibson (1):
      powerpc/mm: Fix stupid bug in subpge protection handling

Dmitry Eremin-Solenikov (4):
      powerpc/83xx: mpc8349emitx - add gpio controller declarations
      powerpc/83xx: mpc8349emitx - populate I2C busses in device tree
      powerpc/83xx: mpc8349emitx - add OF descriptions of LocalBus devices
      powerpc/83xx: mpc8349emitx - add leds-gpio binding

Felix Radensky (1):
      powerpc/85xx: Workaround MPC8572/MPC8536 GPIO 1 errata.

Gautham R Shenoy (2):
      powerpc/pseries: Don't panic when H_PROD fails during cpu-online.
      powerpc/pseries: Make declarations of cpu_hotplug_driver_lock() ANSI compatible.

Mark Ware (1):
      powerpc/cpm2_pic: Allow correct flow_types for port C interrupts

Mel Gorman (1):
      powerpc/pseries: Select XICS and PCI_MSI PSERIES

Neil Campbell (1):
      powerpc: Handle VSX alignment faults correctly in little-endian mode

Peter Korsgaard (1):
      powerpc/gpio: support gpio_to_irq()

Robert Jennings (2):
      mm: Add notifier in pageblock isolation for balloon drivers
      powerpc: Make the CMM memory hotplug aware

Roel Kluin (1):
      powerpc/85xx: Wrong variable returned on error

Sachin P. Sant (1):
      powerpc/mm: Fix hash_utils_64.c compile errors with DEBUG enabled.

Sean MacLennan (1):
      powerpc/44x: Increase warp SD buffer

Sebastian Andrzej Siewior (1):
      powerpc/fsl: try to explain why the interrupt numbers are off by 16

Yang Li (2):
      powerpc/mm: Fix typo of cpumask_clear_cpu()
      powerpc/mpic: Fix problem that affinity is not updated

Yong Zhang (1):
      powerpc/iseries: use DECLARE_COMPLETION_ONSTACK for non-constant completion

 Documentation/powerpc/dts-bindings/fsl/mpic.txt    |   42 ++++
 arch/powerpc/boot/dts/katmai.dts                   |   52 ++++-
 arch/powerpc/boot/dts/mpc8315erdb.dts              |   27 ++
 arch/powerpc/boot/dts/mpc8349emitx.dts             |   82 +++++++-
 arch/powerpc/boot/dts/warp.dts                     |    2 +-
 arch/powerpc/boot/ugecon.c                         |    2 +-
 arch/powerpc/configs/g5_defconfig                  |    6 +-
 arch/powerpc/configs/iseries_defconfig             |    4 +-
 arch/powerpc/configs/ppc64_defconfig               |   14 +-
 arch/powerpc/configs/ppc64e_defconfig              |    4 +-
 arch/powerpc/configs/pseries_defconfig             |   14 +-
 arch/powerpc/include/asm/bug.h                     |    2 +-
 arch/powerpc/include/asm/gpio.h                    |    5 +-
 arch/powerpc/kernel/align.c                        |   63 ++++--
 arch/powerpc/mm/hash_utils_64.c                    |   12 +-
 arch/powerpc/mm/mmu_context_nohash.c               |    2 +-
 arch/powerpc/mm/pgtable_32.c                       |    2 +-
 arch/powerpc/platforms/83xx/suspend.c              |   52 ++++-
 arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    2 +-
 arch/powerpc/platforms/embedded6xx/flipper-pic.c   |    2 +-
 arch/powerpc/platforms/embedded6xx/hlwd-pic.c      |   10 +-
 arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c |    2 +-
 arch/powerpc/platforms/iseries/mf.c                |  147 +++++++-----
 arch/powerpc/platforms/iseries/viopath.c           |    2 +-
 arch/powerpc/platforms/pseries/Kconfig             |    2 +
 arch/powerpc/platforms/pseries/cmm.c               |  254 +++++++++++++++++++-
 arch/powerpc/platforms/pseries/dlpar.c             |    6 +-
 arch/powerpc/platforms/pseries/smp.c               |    4 +-
 arch/powerpc/sysdev/cpm2_pic.c                     |   28 ++-
 arch/powerpc/sysdev/fsl_pci.c                      |    8 +-
 arch/powerpc/sysdev/mpc8xxx_gpio.c                 |   21 ++-
 arch/powerpc/sysdev/mpic.c                         |   19 +-
 arch/powerpc/sysdev/mpic_msi.c                     |   11 +-
 arch/powerpc/sysdev/mpic_u3msi.c                   |   46 +++-
 drivers/base/memory.c                              |   19 ++
 include/linux/memory.h                             |   27 ++
 mm/page_alloc.c                                    |   57 ++++-
 37 files changed, 876 insertions(+), 178 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/fsl/mpic.txt

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus

Please pull one patch from Becky to fix a build breakage in 2.6.32 with
CONFIG_DEBUG_HIGHMEM. This is, I believe, the same patch that went
into ARM to fix the same issue.

Cheers,
Ben.

The following changes since commit a8a8a669ea13d792296737505adc43ccacf3a648:
  Linus Torvalds (1):
        Merge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux

are available in the git repository at:

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

Becky Bruce (1):
      powerpc: Fix DEBUG_HIGHMEM build break from d4515646699

 arch/powerpc/include/asm/kmap_types.h |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This contains one code fix, 3 little device-tree fixes and a bunch of
defconfig updates for Freescale platforms for 2.6.32 along with one
defconfig update for PA-Semi.

Overall, a large diffstat but not much actual churn. If you are unhappy
with the defconfig updates at that stage of the process, let us know and
I'll ask my sub-maintainers to do them earlier.

Cheers,
Ben.

The following changes since commit 799dd75b1a8380a967c929a4551895788c374b31:
  Linus Torvalds (1):
        Merge branch 'i2c-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

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

Anton Vorontsov (2):
      powerpc/85xx: Fix USB GPIOs for MPC8569E-MDS boards
      powerpc/83xx: Fix u-boot partion size for MPC8377E-WLAN boards

Benjamin Herrenschmidt (1):
      Merge commit 'kumar/merge' into merge

Kim Phillips (1):
      powerpc/8xxx: enable IPsec ESP by default on mpc83xx/mpc85xx

Kumar Gala (1):
      powerpc: 2.6.32 update of defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx

Olof Johansson (1):
      powerpc: pasemi_defconfig update

Paul Gortmaker (1):
      powerpc/85xx: sbc8548 - fixup of PCI-e related DTS fields

Roel Kluin (1):
      powerpc/82xx: kmalloc failure ignored in ep8248e_mdio_probe()

 arch/powerpc/boot/dts/mpc8377_wlan.dts            |    2 +-
 arch/powerpc/boot/dts/mpc8569mds.dts              |    4 +-
 arch/powerpc/boot/dts/sbc8548.dts                 |   17 +-
 arch/powerpc/configs/83xx/asp8347_defconfig       |   60 ++-
 arch/powerpc/configs/83xx/kmeter1_defconfig       |   46 +-
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |   73 ++-
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |   76 ++-
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |   62 ++-
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |   66 ++-
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |   60 ++-
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |   58 ++-
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |   58 ++-
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |   64 ++-
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |   60 ++-
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |   64 ++-
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |   70 ++-
 arch/powerpc/configs/83xx/sbc834x_defconfig       |   61 ++-
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   61 ++-
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   57 ++-
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   63 ++-
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   58 ++-
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   53 ++-
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   57 ++-
 arch/powerpc/configs/85xx/socrates_defconfig      |   68 ++-
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |   77 ++-
 arch/powerpc/configs/85xx/tqm8540_defconfig       |   59 ++-
 arch/powerpc/configs/85xx/tqm8541_defconfig       |   64 ++-
 arch/powerpc/configs/85xx/tqm8548_defconfig       |   64 ++-
 arch/powerpc/configs/85xx/tqm8555_defconfig       |   64 ++-
 arch/powerpc/configs/85xx/tqm8560_defconfig       |   64 ++-
 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig   |   76 ++-
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig     |   74 ++-
 arch/powerpc/configs/86xx/gef_sbc310_defconfig    |   72 ++-
 arch/powerpc/configs/86xx/gef_sbc610_defconfig    |   80 ++-
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig  |   64 ++-
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig  |   65 ++-
 arch/powerpc/configs/86xx/sbc8641d_defconfig      |   66 ++-
 arch/powerpc/configs/adder875_defconfig           |   48 +-
 arch/powerpc/configs/c2k_defconfig                |   77 ++-
 arch/powerpc/configs/ep8248e_defconfig            |   49 +-
 arch/powerpc/configs/ep88xc_defconfig             |   47 +-
 arch/powerpc/configs/linkstation_defconfig        |   72 ++-
 arch/powerpc/configs/mgcoge_defconfig             |   51 ++-
 arch/powerpc/configs/mgsuvd_defconfig             |   45 +-
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |   58 ++-
 arch/powerpc/configs/mpc8272_ads_defconfig        |   52 ++-
 arch/powerpc/configs/mpc83xx_defconfig            |   90 ++-
 arch/powerpc/configs/mpc85xx_defconfig            |   98 ++--
 arch/powerpc/configs/mpc85xx_smp_defconfig        |   99 ++--
 arch/powerpc/configs/mpc866_ads_defconfig         |   54 ++-
 arch/powerpc/configs/mpc86xx_defconfig            |   70 ++-
 arch/powerpc/configs/mpc885_ads_defconfig         |   47 +-
 arch/powerpc/configs/pasemi_defconfig             |  628 +++++++++++++++------
 arch/powerpc/configs/pq2fads_defconfig            |   55 ++-
 arch/powerpc/configs/prpmc2800_defconfig          |   67 ++-
 arch/powerpc/configs/storcenter_defconfig         |   54 ++-
 arch/powerpc/platforms/82xx/ep8248e.c             |   15 +-
 57 files changed, 2603 insertions(+), 1380 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some small bits for .32

The Kconfig cleanup you asked for hugetlbfs selection, a few regression
fixes and an actual bug fix that I decided was worth putting in now
(the RTC dates thingy)

Cheers,
Ben. 

The following changes since commit 2e2ec952350f25242f2e0539db16b1e46f9eb01b:
  Linus Torvalds (1):
        Merge branch 'bugfix' of git://git.kernel.org/.../jeremy/xen

are available in the git repository at:

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

Andre Detsch (1):
      powerpc/pci: Fix regression in powerpc MSI-X

Benjamin Herrenschmidt (4):
      powerpc: Cleanup Kconfig selection of hugetlbfs support
      powerpc/mm: Remove debug context clamping from nohash code
      powerpc: Avoid giving out RTC dates below EPOCH
      powerpc/kvm: Remove problematic BUILD_BUG_ON statement

 arch/powerpc/Kconfig                  |    4 ++++
 arch/powerpc/kernel/time.c            |   15 ++++++++++++++-
 arch/powerpc/kvm/timing.h             |    4 ++++
 arch/powerpc/mm/mmu_context_nohash.c  |    4 ++--
 arch/powerpc/platforms/pseries/msi.c  |    2 --
 arch/powerpc/platforms/pseries/xics.c |    9 +++++++++
 fs/Kconfig                            |    2 +-
 7 files changed, 34 insertions(+), 6 deletions(-)

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

[Benjamin Herrenschmidt]

On Thu, 2009-10-29 at 09:14 -0700, Linus Torvalds wrote:
> 
> On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote:
> > 
> > Kumar Gala (7):
> >       powerpc: Add a Book-3E 64-bit defconfig
> >       powerpc: Fix compile errors found by new ppc64e_defconfig
> >       powerpc: Limit hugetlbfs support to PPC64 Book-3S machines
> 
> This is incredibly ugly. Why should the generic fs/Kconfig know about some 
> random odd architecture detail like PPC_BOOK3S_64?
> 
> I merged it, and noticed this because Super-H caused clashes by cleaning 
> up. I would suggest PowerPC do the same.
> 
> This patch is not signed-off, nor do I want any credit. But if it works on 
> ppc, please send me something like this back.

Pushed this to my merge branch:

(BTW. Where does this SYS_* form comes from ? We had ARCH_ now we have
SYS_ * ? Oic... it's a mips thing... oh well no big deal)

>From 5a1eb5c4453207ad9e7f6e8ca4f8db289743c993 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 30 Oct 2009 15:03:54 +1100
Subject: [PATCH] powerpc: Cleanup Kconfig selection of hugetlbfs support

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 arch/powerpc/Kconfig |    4 ++++
 fs/Kconfig           |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 10a0a54..2ba14e7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -414,6 +414,10 @@ config ARCH_SPARSEMEM_DEFAULT
 config ARCH_POPULATES_NODE_MAP
 	def_bool y
 
+config SYS_SUPPORTS_HUGETLBFS
+       def_bool y
+       depends on PPC_BOOK3S_64
+
 source "mm/Kconfig"
 
 config ARCH_MEMORY_PROBE
diff --git a/fs/Kconfig b/fs/Kconfig
index 2126078..64d44ef 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL
 
 config HUGETLBFS
 	bool "HugeTLB file system support"
-	depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \
+	depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
 		   SYS_SUPPORTS_HUGETLBFS || BROKEN
 	help
 	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
-- 
1.6.1.2.14.gf26b5

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

[Benjamin Herrenschmidt]

On Thu, 2009-10-29 at 09:14 -0700, Linus Torvalds wrote:
> 
> On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote:
> > 
> > Kumar Gala (7):
> >       powerpc: Add a Book-3E 64-bit defconfig
> >       powerpc: Fix compile errors found by new ppc64e_defconfig
> >       powerpc: Limit hugetlbfs support to PPC64 Book-3S machines
> 
> This is incredibly ugly. Why should the generic fs/Kconfig know about some 
> random odd architecture detail like PPC_BOOK3S_64?
> 
> I merged it, and noticed this because Super-H caused clashes by cleaning 
> up. I would suggest PowerPC do the same.

Right. I noticed the same thing yesterday and planned to do so today

> This patch is not signed-off, nor do I want any credit. But if it works on 
> ppc, please send me something like this back.

I'll stick something like that in my tree and send you a pull request.

Cheers,
Ben.

> 		Linus
> ---
>  arch/powerpc/Kconfig |    3 +++
>  fs/Kconfig           |    2 +-
>  2 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 10a0a54..877db84 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -131,6 +131,9 @@ config PPC
>  	select GENERIC_ATOMIC64 if PPC32
>  	select HAVE_PERF_EVENTS
>  
> +config SYS_SUPPORTS_HUGETLBFS
> +	defbool PPC_BOOK3S_64
> +
>  config EARLY_PRINTK
>  	bool
>  	default y
> diff --git a/fs/Kconfig b/fs/Kconfig
> index 2126078..64d44ef 100644
> --- a/fs/Kconfig
> +++ b/fs/Kconfig
> @@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL
>  
>  config HUGETLBFS
>  	bool "HugeTLB file system support"
> -	depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \
> +	depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
>  		   SYS_SUPPORTS_HUGETLBFS || BROKEN
>  	help
>  	  hugetlbfs is a filesystem backing for HugeTLB pages, based on

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

[Linus Torvalds]

On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote:
> 
> Kumar Gala (7):
>       powerpc: Add a Book-3E 64-bit defconfig
>       powerpc: Fix compile errors found by new ppc64e_defconfig
>       powerpc: Limit hugetlbfs support to PPC64 Book-3S machines

This is incredibly ugly. Why should the generic fs/Kconfig know about some 
random odd architecture detail like PPC_BOOK3S_64?

I merged it, and noticed this because Super-H caused clashes by cleaning 
up. I would suggest PowerPC do the same.

This patch is not signed-off, nor do I want any credit. But if it works on 
ppc, please send me something like this back.

		Linus
---
 arch/powerpc/Kconfig |    3 +++
 fs/Kconfig           |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 10a0a54..877db84 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -131,6 +131,9 @@ config PPC
 	select GENERIC_ATOMIC64 if PPC32
 	select HAVE_PERF_EVENTS
 
+config SYS_SUPPORTS_HUGETLBFS
+	defbool PPC_BOOK3S_64
+
 config EARLY_PRINTK
 	bool
 	default y
diff --git a/fs/Kconfig b/fs/Kconfig
index 2126078..64d44ef 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL
 
 config HUGETLBFS
 	bool "HugeTLB file system support"
-	depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \
+	depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
 		   SYS_SUPPORTS_HUGETLBFS || BROKEN
 	help
 	  hugetlbfs is a filesystem backing for HugeTLB pages, based on

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

[Benjamin Herrenschmidt]

On Tue, 2009-10-27 at 18:11 +1100, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> Some of these might have been better in -rc4 or earlier, all my fault
> for having some backlog that I'm still going through. So we have some
> bug fixes (not necessarily regressions but also generally simple
> enough that I decided to go for 2.6.32 anyways) and a few very trivial
> Kconfig cleanups (outside of arch/powerpc but related to our symbols)
> from Kumar that could go anytime.

I also had a pending pull request from Grant that I had forgotten. I
added that, it's also minor stuff (device-tree and defconfig updates
mostly and a couple of bug fixes).

New consolidated pull request below.

Cheers,
Ben.

The following changes since commit 964fe080d94db82a3268443e9b9ece4c60246414:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus

are available in the git repository at:

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

Andreas Schwab (2):
      powerpc: Fix segment mapping in vdso32
      powerpc: Align vDSO base address

Benjamin Herrenschmidt (2):
      powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule
      Merge commit 'gcl/merge' into merge

Grant Likely (1):
      powerpc/5200: Update defconfigs

Heiko Schocher (2):
      mpc5200: support for the MAN mpc5200 based board uc101
      mpc5200: support for the MAN mpc5200 based board mucmc52

Josh Boyer (1):
      powerpc/booke: Fix xmon single step on PowerPC Book-E

Julia Lawall (1):
      drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM

Jérôme Pouiller (1):
      of: Remove nested function

Kumar Gala (7):
      powerpc: Add a Book-3E 64-bit defconfig
      powerpc: Fix compile errors found by new ppc64e_defconfig
      powerpc: Limit hugetlbfs support to PPC64 Book-3S machines
      powerpc: Limit memory hotplug support to PPC64 Book-3S machines
      powerpc: Minor cleanup to init/Kconfig
      powerpc: Minor cleanup to sound/ppc/Kconfig
      powerpc: Minor cleanup to lib/Kconfig.debug

Michael Neuling (1):
      powerpc/perf_events: Fix priority of MSR HV vs PR bits

Stephen Rothwell (1):
      powerpc/iseries: Remove compiler version dependent hack

Wolfram Sang (1):
      powerpc/boot/dts: drop obsolete 'fsl5200-clocking'

 arch/powerpc/boot/dts/cm5200.dts              |    1 -
 arch/powerpc/boot/dts/digsy_mtc.dts           |    1 -
 arch/powerpc/boot/dts/lite5200.dts            |    2 -
 arch/powerpc/boot/dts/lite5200b.dts           |    2 -
 arch/powerpc/boot/dts/media5200.dts           |    2 -
 arch/powerpc/boot/dts/motionpro.dts           |    1 -
 arch/powerpc/boot/dts/mpc5121ads.dts          |    3 -
 arch/powerpc/boot/dts/mucmc52.dts             |  332 ++++
 arch/powerpc/boot/dts/pcm030.dts              |    2 -
 arch/powerpc/boot/dts/pcm032.dts              |    2 -
 arch/powerpc/boot/dts/tqm5200.dts             |    1 -
 arch/powerpc/boot/dts/uc101.dts               |  284 ++++
 arch/powerpc/configs/52xx/cm5200_defconfig    |  136 +-
 arch/powerpc/configs/52xx/lite5200b_defconfig |  153 ++-
 arch/powerpc/configs/52xx/motionpro_defconfig |  146 +-
 arch/powerpc/configs/52xx/pcm030_defconfig    |  142 +-
 arch/powerpc/configs/52xx/tqm5200_defconfig   |  148 +-
 arch/powerpc/configs/mpc5200_defconfig        |  192 ++-
 arch/powerpc/configs/ppc64e_defconfig         | 2199 +++++++++++++++++++++++++
 arch/powerpc/kernel/entry_64.S                |   41 +-
 arch/powerpc/kernel/pci_64.c                  |    2 +
 arch/powerpc/kernel/perf_event.c              |   17 +-
 arch/powerpc/kernel/process.c                 |    2 +-
 arch/powerpc/kernel/setup_64.c                |    1 -
 arch/powerpc/kernel/vdso.c                    |   11 +-
 arch/powerpc/kernel/vdso32/vdso32.lds.S       |    4 +-
 arch/powerpc/platforms/52xx/mpc5200_simple.c  |    2 +
 arch/powerpc/platforms/iseries/Makefile       |   11 +-
 arch/powerpc/platforms/iseries/dt.c           |   56 +-
 arch/powerpc/xmon/xmon.c                      |   20 +-
 drivers/of/of_mdio.c                          |   13 +-
 drivers/serial/mpc52xx_uart.c                 |    2 +-
 fs/Kconfig                                    |    2 +-
 init/Kconfig                                  |    2 +-
 lib/Kconfig.debug                             |    2 +-
 mm/Kconfig                                    |    2 +-
 sound/ppc/Kconfig                             |    2 +-
 37 files changed, 3490 insertions(+), 451 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/mucmc52.dts
 create mode 100644 arch/powerpc/boot/dts/uc101.dts
 create mode 100644 arch/powerpc/configs/ppc64e_defconfig

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Some of these might have been better in -rc4 or earlier, all my fault
for having some backlog that I'm still going through. So we have some
bug fixes (not necessarily regressions but also generally simple
enough that I decided to go for 2.6.32 anyways) and a few very trivial
Kconfig cleanups (outside of arch/powerpc but related to our symbols)
from Kumar that could go anytime.

The following changes since commit 964fe080d94db82a3268443e9b9ece4c60246414:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus

are available in the git repository at:

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

Andreas Schwab (2):
      powerpc: Fix segment mapping in vdso32
      powerpc: Align vDSO base address

Benjamin Herrenschmidt (1):
      powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule

Josh Boyer (1):
      powerpc/booke: Fix xmon single step on PowerPC Book-E

Kumar Gala (7):
      powerpc: Add a Book-3E 64-bit defconfig
      powerpc: Fix compile errors found by new ppc64e_defconfig
      powerpc: Limit hugetlbfs support to PPC64 Book-3S machines
      powerpc: Limit memory hotplug support to PPC64 Book-3S machines
      powerpc: Minor cleanup to init/Kconfig
      powerpc: Minor cleanup to sound/ppc/Kconfig
      powerpc: Minor cleanup to lib/Kconfig.debug

Michael Neuling (1):
      powerpc/perf_events: Fix priority of MSR HV vs PR bits

Stephen Rothwell (1):
      powerpc/iseries: Remove compiler version dependent hack

 arch/powerpc/configs/ppc64e_defconfig   | 2199 +++++++++++++++++++++++++++++++
 arch/powerpc/kernel/entry_64.S          |   41 +-
 arch/powerpc/kernel/pci_64.c            |    2 +
 arch/powerpc/kernel/perf_event.c        |   17 +-
 arch/powerpc/kernel/process.c           |    2 +-
 arch/powerpc/kernel/setup_64.c          |    1 -
 arch/powerpc/kernel/vdso.c              |   11 +-
 arch/powerpc/kernel/vdso32/vdso32.lds.S |    4 +-
 arch/powerpc/platforms/iseries/Makefile |   11 +-
 arch/powerpc/platforms/iseries/dt.c     |   56 +-
 arch/powerpc/xmon/xmon.c                |   20 +-
 fs/Kconfig                              |    2 +-
 init/Kconfig                            |    2 +-
 lib/Kconfig.debug                       |    2 +-
 mm/Kconfig                              |    2 +-
 sound/ppc/Kconfig                       |    2 +-
 16 files changed, 2294 insertions(+), 80 deletions(-)
 create mode 100644 arch/powerpc/configs/ppc64e_defconfig

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

A tad late due mostly to me being on vacation :-) Here's some powerpc
fixes for 2.6.32, not that much and nothing really big.

The following changes since commit 80f506918fdaaca6b574ba931536a58ce015c7be:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

are available in the git repository at:

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

Anton Blanchard (1):
      powerpc: Fix hypervisor TLB batching

Anton Vorontsov (1):
      powerpc/kgdb: Fix build failure caused by "kgdb.c: unused variable 'acc'"

Benjamin Herrenschmidt (3):
      powerpc/pmac: Fix issues with sleep on some powerbooks
      powerpc/mm: Fix hang accessing top of vmalloc space
      Merge commit 'ftrace/ppc' into merge

Dragos Tatulea (1):
      powerpc/oprofile: Add ppc750 CL as supported by oprofile

Heiko Schocher (1):
      powerpc/pci: Fix MODPOST warning

Michael Ellerman (1):
      powerpc: Fix memory leak in axon_msi.c

Sean MacLennan (1):
      powerpc: warning: allocated section `.data_nosave' not in segment

Steven Rostedt (2):
      powerpc/ftrace: show real return addresses in modules
      powerpc64/ftrace: use PACA to retrieve TOC in mod_return_to_handler

 arch/powerpc/include/asm/firmware.h       |   10 +++---
 arch/powerpc/kernel/cputable.c            |    2 +
 arch/powerpc/kernel/entry_64.S            |    3 +-
 arch/powerpc/kernel/kgdb.c                |    6 ----
 arch/powerpc/kernel/pci-common.c          |    2 +-
 arch/powerpc/kernel/process.c             |   10 +++++--
 arch/powerpc/kernel/vmlinux.lds.S         |    1 +
 arch/powerpc/mm/slb_low.S                 |   10 +++----
 arch/powerpc/platforms/cell/axon_msi.c    |    2 +-
 arch/powerpc/platforms/powermac/low_i2c.c |    7 +++-
 arch/powerpc/platforms/pseries/firmware.c |    3 +-
 drivers/macintosh/via-pmu.c               |   40 ++++++++++++++++------------
 12 files changed, 51 insertions(+), 45 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few more powerpc bits for 2.6.32. Mostly bug fixes, and a couple
of performance nits from Anton.

Cheers,
Ben.

The following changes since commit 94a8d5caba74211ec76dac80fc6e2d5c391530df:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus

are available in the git repository at:

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

Anton Blanchard (4):
      powerpc: Move 64bit heap above 1TB on machines with 1TB segments
      powerpc/perf_counter: Fix vdso detection
      powerpc: Increase NODES_SHIFT on 64bit from 4 to 8
      powerpc: Fix ibm,client-architecture-support printout

Becky Bruce (2):
      powerpc: Rename get_dma_direct_offset get_dma_offset
      powerpc: Change archdata dma_data to a union

Benjamin Herrenschmidt (3):
      powerpc/pmc: Don't access lppaca on Book3E
      powerpc/mm: Fix 40x and 8xx vs. _PAGE_SPECIAL
      Fix build of cpm_uart due to core changes

Hendrik Brueckner (1):
      hvc_console: Provide (un)locked version for hvc_resize()

Huang Weiyi (2):
      powerpc/book3e-64: Remove duplicated #include
      powerpc/mm: Remove duplicated #include

Josh Boyer (1):
      powerpc/4xx: Fix erroneous xmon warning on PowerPC 4xx

Rex Feany (1):
      powerpc/8xx: Fix regression introduced by cache coherency rewrite

Tim Abbott (1):
      powerpc: Cleanup linker script using new linker script macros.

Tony Breeds (1):
      powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE

roel kluin (1):
      powerpc: kmalloc failure ignored in vio_build_iommu_table()

 arch/powerpc/Kconfig                     |    6 +++
 arch/powerpc/Makefile                    |   11 +++++
 arch/powerpc/include/asm/device.h        |   11 ++++-
 arch/powerpc/include/asm/dma-mapping.h   |   27 ++++++++++-
 arch/powerpc/include/asm/iommu.h         |   10 ++++
 arch/powerpc/include/asm/pmc.h           |    2 +-
 arch/powerpc/include/asm/pte-40x.h       |    1 +
 arch/powerpc/include/asm/pte-8xx.h       |    1 +
 arch/powerpc/include/asm/pte-common.h    |    5 --
 arch/powerpc/kernel/dma-iommu.c          |   16 +++---
 arch/powerpc/kernel/dma.c                |   15 ++-----
 arch/powerpc/kernel/exceptions-64e.S     |    1 -
 arch/powerpc/kernel/pci-common.c         |    2 +-
 arch/powerpc/kernel/process.c            |   17 +++++++-
 arch/powerpc/kernel/prom_init.c          |    3 +-
 arch/powerpc/kernel/vdso.c               |   14 ++++--
 arch/powerpc/kernel/vio.c                |    4 +-
 arch/powerpc/kernel/vmlinux.lds.S        |   69 ++++++-----------------------
 arch/powerpc/mm/pgtable.c                |   19 +++++++-
 arch/powerpc/mm/tlb_low_64e.S            |    1 -
 arch/powerpc/platforms/cell/beat_iommu.c |    2 +-
 arch/powerpc/platforms/cell/iommu.c      |    9 +---
 arch/powerpc/platforms/iseries/iommu.c   |    2 +-
 arch/powerpc/platforms/pasemi/iommu.c    |    2 +-
 arch/powerpc/platforms/pseries/iommu.c   |    8 ++--
 arch/powerpc/relocs_check.pl             |   56 ++++++++++++++++++++++++
 arch/powerpc/sysdev/dart_iommu.c         |    2 +-
 arch/powerpc/xmon/xmon.c                 |   16 ++++++-
 drivers/char/hvc_console.c               |    6 +-
 drivers/char/hvc_console.h               |   12 +++++-
 drivers/char/hvc_iucv.c                  |    4 +-
 drivers/serial/cpm_uart/cpm_uart_core.c  |    2 +-
 32 files changed, 237 insertions(+), 119 deletions(-)
 create mode 100755 arch/powerpc/relocs_check.pl

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a couple of last minute patches for 2.6.31. One is a regression fix
(afaik) where a PS3 driver gets incorrectly loaded on other platforms and
crashes, along with a PS3 defconfig update.
The following changes since commit f415c413f458837bd0c27086b79aca889f9435e4:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

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

Geert Uytterhoeven (1):
      powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration

Geoff Levand (1):
      powerpc/ps3: Update ps3_defconfig

 arch/powerpc/configs/ps3_defconfig |  211 +++++++++++++-----------------------
 arch/powerpc/platforms/ps3/time.c  |    4 +
 2 files changed, 79 insertions(+), 136 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This is a simple enough fix that I decided was worth having now, it
basically allow "direct" DMA (non-iommu) to work for devices that have a
< 32-bit DMA mask (such as some infamous broadcom wireless chips) when
the machine simply has not enough memory to go over the chip addressing
limit. This fixes various smallish G5 (like old iMac G5) wireless.

The following changes since commit f4b9a988685da6386d7f9a72df3098bcc3270526:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM

 arch/powerpc/kernel/dma.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a bunch of defconfig updates for freescale embedded platforms
along with a handful of fixes for those from Kumar, and one important
one liner fix for a thinko/typo by myself in the embedded CPU context
management code on SMP.

The following changes since commit 658874f05d040ca96eb5ba9b1c30ce0ff287d762:
  Linus Torvalds (1):
        Merge branch 'i2c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux

are available in the git repository at:

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

Anton Vorontsov (3):
      powerpc/85xx: Fix ethernet link detection on MPC8569E-MDS boards
      powerpc/85xx: Don't scan for TBI PHY addresses on MPC8569E-MDS boards
      powerpc/83xx: Fix PCI IO base address on MPC837xE-RDB boards

Kumar Gala (2):
      powerpc/mm: Fix SMP issue with MMU context handling code
      powerpc: Update defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx

Mark Ware (1):
      cpm_uart: Don't use alloc_bootmem in cpm_uart_cpm2.c

Martyn Welch (2):
      powerpc/86xx: Update defconfig for GE Fanuc's PPC9A
      powerpc/86xx: Update GE Fanuc sbc310 default configuration

 arch/powerpc/boot/dts/mpc8377_rdb.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8378_rdb.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8379_rdb.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8569mds.dts              |    4 +
 arch/powerpc/configs/83xx/asp8347_defconfig       |  106 +++--
 arch/powerpc/configs/83xx/kmeter1_defconfig       |  176 +++++---
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |  168 +++++--
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |  168 +++++--
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |  111 +++--
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |  120 +++--
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |  114 +++--
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |  114 +++--
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |  104 +++--
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |  111 +++--
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |  104 +++--
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |  110 +++--
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |  162 +++++---
 arch/powerpc/configs/83xx/sbc834x_defconfig       |  103 +++--
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   93 +++--
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   91 +++--
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   99 +++--
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   99 +++--
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   96 +++--
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   91 +++--
 arch/powerpc/configs/85xx/socrates_defconfig      |  165 +++++---
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |  119 +++--
 arch/powerpc/configs/85xx/tqm8540_defconfig       |  100 +++--
 arch/powerpc/configs/85xx/tqm8541_defconfig       |  101 +++--
 arch/powerpc/configs/85xx/tqm8548_defconfig       |  100 +++--
 arch/powerpc/configs/85xx/tqm8555_defconfig       |  101 +++--
 arch/powerpc/configs/85xx/tqm8560_defconfig       |  101 +++--
 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig   |  118 +++--
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig     |  521 ++++++++-------------
 arch/powerpc/configs/86xx/gef_sbc310_defconfig    |  216 +++++++---
 arch/powerpc/configs/86xx/gef_sbc610_defconfig    |  130 ++++--
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig  |  118 +++--
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig  |  186 ++++----
 arch/powerpc/configs/86xx/sbc8641d_defconfig      |  112 +++--
 arch/powerpc/configs/adder875_defconfig           |   97 +++--
 arch/powerpc/configs/c2k_defconfig                |  121 +++--
 arch/powerpc/configs/ep8248e_defconfig            |   97 +++--
 arch/powerpc/configs/ep88xc_defconfig             |   91 +++--
 arch/powerpc/configs/linkstation_defconfig        |  116 +++--
 arch/powerpc/configs/mgcoge_defconfig             |   97 +++--
 arch/powerpc/configs/mgsuvd_defconfig             |   89 ++--
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |  103 +++--
 arch/powerpc/configs/mpc8272_ads_defconfig        |  104 +++--
 arch/powerpc/configs/mpc83xx_defconfig            |  162 +++++---
 arch/powerpc/configs/mpc85xx_defconfig            |  193 ++++----
 arch/powerpc/configs/mpc85xx_smp_defconfig        |  193 ++++----
 arch/powerpc/configs/mpc866_ads_defconfig         |   92 ++--
 arch/powerpc/configs/mpc86xx_defconfig            |  186 ++++----
 arch/powerpc/configs/mpc885_ads_defconfig         |   91 +++--
 arch/powerpc/configs/pq2fads_defconfig            |  110 +++--
 arch/powerpc/configs/prpmc2800_defconfig          |  158 +++++--
 arch/powerpc/configs/storcenter_defconfig         |  108 +++--
 arch/powerpc/mm/mmu_context_nohash.c              |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_mds.c         |   13 +
 drivers/serial/cpm_uart/cpm_uart_cpm2.c           |    2 +-
 59 files changed, 4007 insertions(+), 2755 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a couple of fixes for powerpc for 2.6.31.

The following changes since commit e9e961c9a818a2f24711af493b907a8e40a69efc:
  Linus Torvalds (1):
        Merge branch 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux

are available in the git repository at:

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

Andreas Schwab (1):
      powerpc: Fix another bug in move of altivec code to vector.S

Dave Kleikamp (1):
      powerpc: Fix booke user_disable_single_step()

 arch/powerpc/kernel/ptrace.c |   17 +++++++++--------
 arch/powerpc/kernel/vector.S |    6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a bunch of minor powerpc updates for 2.6.31. Mostly a few
more alloc_bootmem -> km/zalloc changes to avoid warnings at boot,
a bug or two, minor cosmetic stuffs, and some changes of a whole
bunch of pr_debug() into pr_devel() for low level stuff that really
doesn't want those built in normal kernels.

Cheers,
Ben.

The following changes since commit faf80d62e44dc627efb741f48db50c1858d1667c:
  Linus Torvalds (1):
        Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

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

Anton Vorontsov (1):
      powerpc: Don't use alloc_bootmem() in init_IRQ() path

Benjamin Herrenschmidt (1):
      Merge commit 'jwb/merge' into merge

Grant Likely (1):
      powerpc: Fix spin_event_timeout() to be robust over context switches

Huang Weiyi (1):
      powerpc/perf_counter: Remove duplicated #include

Joe Perches (1):
      powerpc: Remove unnecessary semicolons

Josh Boyer (1):
      powerpc/44x: Fix build error with -Werror for Warp platform

Michael Ellerman (7):
      powerpc/pseries: Use pr_devel() in pseries LPAR HPTE routines
      powerpc/pseries: Use pr_devel() in xics.c
      powerpc: Use pr_devel() in arch/powerpc/mm/mmu_context_nohash.c
      powerpc: Cleanup & use pr_devel() in arch/powerpc/mm/slb.c
      powerpc: Use pr_devel() in arch/powerpc/mm/gup.c
      powerpc/cell: Use pr_devel() in axon_msi.c
      powerpc: Use pr_devel() in do_dcache_icache_coherency()

Sean MacLennan (2):
      powerpc/44x: Update Warp defconfig
      powerpc/4xx: Have Warp take advantage of GPIO LEDs default-state = keep

 arch/powerpc/boot/dts/warp.dts               |    3 +-
 arch/powerpc/configs/44x/warp_defconfig      |  200 ++++++++++++++++++++------
 arch/powerpc/include/asm/delay.h             |    2 +
 arch/powerpc/kernel/mpc7450-pmu.c            |    1 -
 arch/powerpc/kernel/ppc970-pmu.c             |    1 -
 arch/powerpc/mm/gup.c                        |   10 +-
 arch/powerpc/mm/mmu_context_nohash.c         |   16 +-
 arch/powerpc/mm/pgtable.c                    |    4 +-
 arch/powerpc/mm/slb.c                        |   13 +--
 arch/powerpc/mm/tlb_hash64.c                 |    2 +-
 arch/powerpc/oprofile/cell/vma_map.c         |    2 +-
 arch/powerpc/platforms/44x/warp.c            |   19 +--
 arch/powerpc/platforms/82xx/pq2ads-pci-pic.c |    2 +-
 arch/powerpc/platforms/cell/axon_msi.c       |   22 ++--
 arch/powerpc/platforms/powermac/cpufreq_64.c |    2 +-
 arch/powerpc/platforms/powermac/pic.c        |    2 +-
 arch/powerpc/platforms/ps3/system-bus.c      |    1 -
 arch/powerpc/platforms/pseries/lpar.c        |   18 ++--
 arch/powerpc/platforms/pseries/xics.c        |    8 +-
 arch/powerpc/sysdev/fsl_rio.c                |    2 +-
 arch/powerpc/sysdev/ipic.c                   |    4 +-
 arch/powerpc/sysdev/mpic.c                   |    9 +-
 arch/powerpc/sysdev/ppc4xx_pci.c             |    4 +-
 arch/powerpc/sysdev/qe_lib/qe_ic.c           |    4 +-
 arch/powerpc/sysdev/uic.c                    |    3 +-
 25 files changed, 225 insertions(+), 129 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

I would have hoped to get that stuff in before -rc1 but heh, I got sick
for a couple of days, a distracted by some other stuff for a couple more
and here we are, I missed it :-)

Anyway, here are a bunch of relatively small ppc bits, almost all are
bug fixes, mostly regressions, with the notable exception of one patch
which I decided was worth taking a chance, which is the addition of
lockdep/irqtrace support for ppc32 which has been around for 2 or 3
weeks and seems to be working well (it already found a couple of
bugs !).


The following changes since commit 987fed3bf6982f2627d4fa242caa9026ef61132a:
  Linus Torvalds (1):
        Merge branch 'drm-fixes' of git://git.kernel.org/.../airlied/drm-2.6

are available in the git repository at:

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

Adrian Reber (1):
      powerpc/rtas: Fix watchdog driver temperature read functionality

Anton Vorontsov (1):
      powerpc/85xx: Make eSDHC 1-bit only transfer mode default for MPC8569E-MDS

Benjamin Herrenschmidt (13):
      powerpc/mpic: Fix mapping of "DCR" based MPIC variants
      powerpc/pmac: Fix issues with PowerMac "PowerSurge" SMP
      powerpc/mm: Make k(un)map_atomic out of line
      powerpc/pmac: Fix DMA ops for MacIO devices
      powerpc: Map more memory early on 601 processors
      powerpc: Add irqtrace support for 32-bit powerpc
      powerpc/rtas: Turn rtas lock into a raw spinlock
      powerpc: Use one common impl. of RTAS timebase sync and use raw spinlock
      powerpc/pasemi: Use raw spinlock in SMP TB sync
      powerpc/of: Fix usage of dev_set_name() in of_device_alloc()
      powerpc/440: Fix warning early debug code
      powerpc/mm: Fix potential access to freed pages when using hugetlbfs
      Merge commit 'kumar/next' into merge

Gerhard Pircher (1):
      powerpc/amigaone: Limit ISA I/O range to 4k in the device tree

Huang Weiyi (1):
      powerpc/85xx: remove duplicated #include

Jon Smirl (1):
      powerpc: Have git ignore generated files from dtc compile

Kumar Gala (6):
      powerpc/cpm1: Remove IMAP_ADDR
      powerpc/85xx: Stop using ppc_md.init on socrates
      powerpc/85xx: Fix issue found by lockdep trace in smp_85xx_kick_cpu
      powerpc: Refactor device tree binding
      powerpc: Fix output from show_regs
      powerpc: Fix mpic alloc warning

Michael Ellerman (1):
      powerpc: Swiotlb breaks pseries

Randy Vinson (1):
      powerpc/85xx: Fix FSL RapidIO probing on MDS boards

Sean MacLennan (1):
      powerpc/warp: Platform fix for i2c change

Sonny Rao (2):
      powerpc/BSR: add 4096 byte BSR size
      powerpc/BSR: Fix BSR to allow mmap of small BSR on 64k kernel

Timur Tabi (1):
      powerpc/qe: add polling timeout to qe_issue_cmd()

 Documentation/powerpc/booting-without-of.txt     | 1168 +---------------------
 Documentation/powerpc/dts-bindings/4xx/emac.txt  |  148 +++
 Documentation/powerpc/dts-bindings/gpio/gpio.txt |   50 +
 Documentation/powerpc/dts-bindings/gpio/mdio.txt |   19 +
 Documentation/powerpc/dts-bindings/marvell.txt   |  521 ++++++++++
 Documentation/powerpc/dts-bindings/phy.txt       |   25 +
 Documentation/powerpc/dts-bindings/spi-bus.txt   |   57 ++
 Documentation/powerpc/dts-bindings/usb-ehci.txt  |   25 +
 Documentation/powerpc/dts-bindings/xilinx.txt    |  295 ++++++
 arch/powerpc/Kconfig                             |    1 -
 arch/powerpc/boot/.gitignore                     |   10 +
 arch/powerpc/boot/dts/amigaone.dts               |    4 +-
 arch/powerpc/boot/dts/mpc8569mds.dts             |    1 +
 arch/powerpc/include/asm/cpm1.h                  |    2 -
 arch/powerpc/include/asm/dma-mapping.h           |   24 +-
 arch/powerpc/include/asm/highmem.h               |   57 +-
 arch/powerpc/include/asm/hw_irq.h                |   20 +-
 arch/powerpc/include/asm/pte-hash64-64k.h        |    3 +-
 arch/powerpc/include/asm/rtas.h                  |    5 +-
 arch/powerpc/kernel/entry_32.S                   |  127 +++-
 arch/powerpc/kernel/head_32.S                    |   17 +-
 arch/powerpc/kernel/of_device.c                  |    2 +-
 arch/powerpc/kernel/process.c                    |    2 +-
 arch/powerpc/kernel/rtas.c                       |   69 ++-
 arch/powerpc/kernel/setup_32.c                   |    2 +
 arch/powerpc/kernel/smp.c                        |    3 +-
 arch/powerpc/kernel/udbg_16550.c                 |    2 +-
 arch/powerpc/mm/Makefile                         |    1 +
 arch/powerpc/mm/highmem.c                        |   77 ++
 arch/powerpc/platforms/44x/warp.c                |   44 +-
 arch/powerpc/platforms/85xx/mpc85xx_mds.c        |    1 +
 arch/powerpc/platforms/85xx/smp.c                |    9 +-
 arch/powerpc/platforms/85xx/socrates.c           |    6 +-
 arch/powerpc/platforms/85xx/xes_mpc85xx.c        |    1 -
 arch/powerpc/platforms/cell/smp.c                |   30 +-
 arch/powerpc/platforms/chrp/smp.c                |   33 +-
 arch/powerpc/platforms/pasemi/setup.c            |   15 +-
 arch/powerpc/platforms/powermac/setup.c          |   41 +-
 arch/powerpc/platforms/powermac/smp.c            |  166 ++--
 arch/powerpc/platforms/pseries/smp.c             |   30 +-
 arch/powerpc/sysdev/mpic.c                       |   34 +-
 arch/powerpc/sysdev/qe_lib/qe.c                  |    9 +-
 drivers/char/bsr.c                               |   42 +-
 drivers/macintosh/macio_asic.c                   |   11 +
 drivers/watchdog/wdrtas.c                        |    8 +-
 scripts/dtc/.gitignore                           |    5 +
 46 files changed, 1691 insertions(+), 1531 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/4xx/emac.txt
 create mode 100644 Documentation/powerpc/dts-bindings/gpio/gpio.txt
 create mode 100644 Documentation/powerpc/dts-bindings/gpio/mdio.txt
 create mode 100644 Documentation/powerpc/dts-bindings/marvell.txt
 create mode 100644 Documentation/powerpc/dts-bindings/phy.txt
 create mode 100644 Documentation/powerpc/dts-bindings/spi-bus.txt
 create mode 100644 Documentation/powerpc/dts-bindings/usb-ehci.txt
 create mode 100644 Documentation/powerpc/dts-bindings/xilinx.txt
 create mode 100644 arch/powerpc/mm/highmem.c
 create mode 100644 scripts/dtc/.gitignore

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's another batch to finally drain my queue. There will be bug fixes
coming but they don't need to be before -rc1. The only "feature" I'm
still considering merging this time around and that isn't there yet is
the support for irqtrace/lockdep on ppc32 since it's a useful debug
tool, and mostly should be a nop unless lockdep is enabled.

The following changes since commit 0732f87761dbe417cb6e084b712d07e879e876ef:
  Linus Torvalds (1):
        Merge branch 'for_linus' of git://git.kernel.org/.../tytso/ext4

are available in the git repository at:

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

Anton Vorontsov (2):
      powerpc/83xx: Update sdhci nodes per new bindings
      powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback

Becky Bruce (1):
      powerpc: Add 86xx support for SWIOTLB

Benjamin Herrenschmidt (5):
      powerpc: Fix invalid construct in our CPU selection Kconfig
      powerpc: Add memory clobber to mtspr()
      Merge commit 'origin/master' into next
      Merge commit 'origin/master' into next
      Merge commit 'gcl/merge' into next

Dave Liu (1):
      serial: Make ucc_uart work in HW UART mode

Dave Mitchell (1):
      of_serial: Add UPF_FIXED_TYPE flag

Geert Uytterhoeven (3):
      net/ps3: gelic - Add missing annotations
      ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
      usb/ps3: Add missing annotations

Gerhard Pircher (1):
      powerpc: Enable additional BAT registers in setup_745x_specifics()

Grant Likely (1):
      fbdev/xilinxfb: Fix improper casting and tighen up probe path

Haiying Wang (1):
      powerpc/85xx: Add UCC6 and UCC8 nodes in SGMII mode for MPC8569MDS

Heiko Schocher (1):
      83xx: add support for the kmeter1 board.

Kevin Hao (1):
      powerpc/85xx: Add nor flash partitions for mpc8569mds

Kumar Gala (1):
      powerpc/85xx: Add SWIOTLB support to FSL boards

Martyn Welch (1):
      powerpc/86xx: Add I2C device mappings in DTS for SBC610

Michael Ellerman (1):
      powerpc: Add configurable -Werror for arch/powerpc

Mike Frysinger (1):
      drivers/hvc: Add missing __devexit_p()

Nate Case (6):
      powerpc/fsl-booke: Enable L1 cache on e500v1/e500v2/e500mc CPUs
      powerpc/85xx: cuboot - Fix up ethernet3 MAC address on MPC85xx
      powerpc/85xx: Add platform support for X-ES MPC85xx boards
      powerpc/85xx: Add dts files for X-ES MPC85xx boards
      powerpc/85xx: Add defconfig for X-ES MPC85xx boards
      powerpc/bootwrapper: Custom build options for XPedite52xx targets

Peter Korsgaard (1):
      powerpc/mpc83xx: Fix usb mux setup for mpc834x

Sean MacLennan (1):
      powerpc/warp: Fix ISA_DMA_THRESHOLD default

Timur Tabi (1):
      powerpc: Introduce macro spin_event_timeout()

Wolfgang Denk (2):
      powerpc/mpc8272ads: fix device tree for 8 MB flash size
      powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function

Wolfram Sang (2):
      powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft
      powerpc/5121: make clock debug output more readable

Yang Li (1):
      rio: warn_unused_result warnings fix

leon.woestenberg@gmail.com (1):
      powerpc/83xx: Add MSI interrupts to DTS of MPC8315E-RDB

mware@internode.on.net (1):
      powerpc/fsl: Increase the number of possible localbus banks

 arch/powerpc/Kconfig.debug                        |   17 +
 arch/powerpc/boot/cuboot-85xx.c                   |    2 +
 arch/powerpc/boot/dts/asp834x-redboot.dts         |    2 +-
 arch/powerpc/boot/dts/gef_sbc610.dts              |   10 +
 arch/powerpc/boot/dts/kmeter1.dts                 |  520 ++++++
 arch/powerpc/boot/dts/mpc8272ads.dts              |   19 +-
 arch/powerpc/boot/dts/mpc8315erdb.dts             |   15 +
 arch/powerpc/boot/dts/mpc8349emitx.dts            |    2 +-
 arch/powerpc/boot/dts/mpc834x_mds.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8377_mds.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8377_rdb.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8378_mds.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8378_rdb.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8379_mds.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8379_rdb.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8569mds.dts              |   87 +-
 arch/powerpc/boot/dts/pcm030.dts                  |   26 +-
 arch/powerpc/boot/dts/sbc8349.dts                 |    2 +-
 arch/powerpc/boot/dts/xcalibur1501.dts            |  696 ++++++++
 arch/powerpc/boot/dts/xpedite5200.dts             |  466 ++++++
 arch/powerpc/boot/dts/xpedite5200_xmon.dts        |  506 ++++++
 arch/powerpc/boot/dts/xpedite5301.dts             |  640 ++++++++
 arch/powerpc/boot/dts/xpedite5330.dts             |  707 ++++++++
 arch/powerpc/boot/dts/xpedite5370.dts             |  638 ++++++++
 arch/powerpc/boot/wrapper                         |    4 +
 arch/powerpc/configs/83xx/kmeter1_defconfig       |  908 ++++++++++
 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig   | 1821 +++++++++++++++++++++
 arch/powerpc/include/asm/delay.h                  |   36 +
 arch/powerpc/include/asm/fsl_lbc.h                |    4 +-
 arch/powerpc/include/asm/mpc52xx.h                |    2 +-
 arch/powerpc/include/asm/{mpc512x.h => mpc5xxx.h} |   10 +-
 arch/powerpc/include/asm/reg.h                    |    3 +-
 arch/powerpc/include/asm/reg_booke.h              |    2 +
 arch/powerpc/kernel/Makefile                      |    2 +
 arch/powerpc/kernel/cpu_setup_6xx.S               |    3 +
 arch/powerpc/kernel/cpu_setup_fsl_booke.S         |   49 +-
 arch/powerpc/kvm/Makefile                         |    2 +
 arch/powerpc/lib/Makefile                         |    2 +
 arch/powerpc/mm/Makefile                          |    2 +
 arch/powerpc/oprofile/Makefile                    |    2 +
 arch/powerpc/platforms/44x/warp.c                 |    8 +-
 arch/powerpc/platforms/512x/clock.c               |   10 +-
 arch/powerpc/platforms/512x/mpc512x.h             |    1 -
 arch/powerpc/platforms/512x/mpc512x_shared.c      |   23 -
 arch/powerpc/platforms/52xx/mpc52xx_common.c      |   32 +-
 arch/powerpc/platforms/83xx/Kconfig               |    7 +
 arch/powerpc/platforms/83xx/Makefile              |    1 +
 arch/powerpc/platforms/83xx/kmeter1.c             |  191 +++
 arch/powerpc/platforms/83xx/mpc83xx.h             |    4 +-
 arch/powerpc/platforms/83xx/usb.c                 |   10 +-
 arch/powerpc/platforms/85xx/Kconfig               |   13 +
 arch/powerpc/platforms/85xx/Makefile              |    1 +
 arch/powerpc/platforms/85xx/mpc8536_ds.c          |   17 +
 arch/powerpc/platforms/85xx/mpc85xx_ds.c          |   19 +
 arch/powerpc/platforms/85xx/mpc85xx_mds.c         |   20 +
 arch/powerpc/platforms/85xx/xes_mpc85xx.c         |  282 ++++
 arch/powerpc/platforms/86xx/Kconfig               |    1 +
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        |   15 +
 arch/powerpc/platforms/Kconfig.cputype            |    9 +-
 arch/powerpc/platforms/Makefile                   |    2 +
 arch/powerpc/sysdev/Makefile                      |    5 +
 arch/powerpc/sysdev/mpc5xxx_clocks.c              |   33 +
 arch/powerpc/xmon/Makefile                        |    2 +
 drivers/ata/pata_mpc52xx.c                        |    2 +-
 drivers/char/hvc_iseries.c                        |    2 +-
 drivers/char/hvc_vio.c                            |    2 +-
 drivers/char/hvcs.c                               |    2 +-
 drivers/i2c/busses/i2c-mpc.c                      |    2 +-
 drivers/net/fec_mpc52xx.c                         |    2 +-
 drivers/net/fec_mpc52xx_phy.c                     |    2 +-
 drivers/net/ps3_gelic_net.c                       |   22 +-
 drivers/net/ps3_gelic_wireless.c                  |    6 +-
 drivers/rapidio/rio-scan.c                        |   43 +-
 drivers/rapidio/rio-sysfs.c                       |    6 +-
 drivers/scsi/ps3rom.c                             |   10 +-
 drivers/serial/mpc52xx_uart.c                     |    5 +-
 drivers/serial/of_serial.c                        |    2 +-
 drivers/serial/ucc_uart.c                         |   19 +-
 drivers/spi/mpc52xx_psc_spi.c                     |   22 +-
 drivers/usb/host/ehci-ps3.c                       |    4 +-
 drivers/usb/host/ohci-ps3.c                       |    4 +-
 drivers/video/xilinxfb.c                          |   59 +-
 drivers/watchdog/mpc5200_wdt.c                    |    2 +-
 include/linux/fsl_devices.h                       |    4 -
 84 files changed, 7916 insertions(+), 233 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/kmeter1.dts
 create mode 100644 arch/powerpc/boot/dts/xcalibur1501.dts
 create mode 100644 arch/powerpc/boot/dts/xpedite5200.dts
 create mode 100644 arch/powerpc/boot/dts/xpedite5200_xmon.dts
 create mode 100644 arch/powerpc/boot/dts/xpedite5301.dts
 create mode 100644 arch/powerpc/boot/dts/xpedite5330.dts
 create mode 100644 arch/powerpc/boot/dts/xpedite5370.dts
 create mode 100644 arch/powerpc/configs/83xx/kmeter1_defconfig
 create mode 100644 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
 rename arch/powerpc/include/asm/{mpc512x.h => mpc5xxx.h} (65%)
 create mode 100644 arch/powerpc/platforms/83xx/kmeter1.c
 create mode 100644 arch/powerpc/platforms/85xx/xes_mpc85xx.c
 create mode 100644 arch/powerpc/sysdev/mpc5xxx_clocks.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's the other batch of powerpc stuff, including adding a small
accessor to the generic BIO code (acked by Jens) and Paulus generic
atomic64 implementation. A lot of PS3 updates in there, though I held
back a couple for some purely mechanical merge reasons, so expect a 3rd
batch with these plus some bug fixes before the end of the merge window.

The following changes since commit 03347e2592078a90df818670fddf97a33eec70fb:
  Linus Torvalds (1):
        Merge branch 'release' of git://git.kernel.org/.../aegl/linux-2.6

are available in the git repository at:

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

Benjamin Herrenschmidt (2):
      Merge commit 'origin/master' into next
      powerpc: Don't do generic calibrate_delay()

Geert Uytterhoeven (24):
      ps3vram: Fix error path (return -EIO) for short read/write
      ps3vram: Use proc_create_data() instead of proc_create()
      ps3fb: Remove useless debug checks in ps3fb_shutdown()
      ps3fb: Inline functions in ps3fb_probe(), to ease cleanup in the error path
      ps3fb: Correct handling of device opening in ps3fb_probe()
      powerpc/cell: Extract duplicated IOPTE_* to <asm/iommu.h>
      ps3fb: GPU memory mapping cleanup
      ps3vram: GPU memory mapping cleanup
      ps3fb/vram: Extract common GPU stuff into <asm/ps3gpu.h>
      ps3fb: Tear down FB setup during cleanup
      block: Add bio_list_peek()
      ps3vram: Replace mutex by spinlock + bio_list
      ps3vram: Remove no longer used ps3vram_priv.ddr_base
      ps3vram: Make ps3vram_priv.reports a void *
      ps3: Use dev_[gs]et_drvdata() instead of direct access for system bus devices
      ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata
      ps3flash: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
      ps3fb: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
      drivers/ps3: Add missing annotations
      ps3: Correct debug message in dma_ioc0_map_pages()
      ps3: Switch ps3_os_area_[gs]et_rtc_diff to EXPORT_SYMBOL_GPL()
      ps3: Replace direct file operations by callback
      ps3flash: Cache the last accessed FLASH chunk
      ps3flash: Always read chunks of 256 KiB, and cache them

Grant Likely (1):
      powerpc/install: Bail with error code on error in install script

Jim Paris (1):
      ps3vram: Correct exchanged gotos in ps3vram_probe() error path

Michael Ellerman (5):
      powerpc: Fix warning in setup_64.c when CONFIG_RELOCATABLE=y
      powerpc/cell: Use driver_data acessors, not platform_data in Axon MSI
      powerpc: Only build prom_init.o when CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
      powerpc/iseries: Fix unused function warning in iSeries DT code
      powerpc/iseries: Mark signal_vsp_instruction() as maybe unused

Paul Mackerras (3):
      powerpc: Add compiler memory barrier to mtmsr macro
      lib: Provide generic atomic64_t implementation
      powerpc: Use generic atomic64_t implementation on 32-bit processors

Roel Kluin (1):
      block/ps3: remove driver_data direct access of struct device

Stephen Rothwell (1):
      powerpc: Wire up sys_rt_tgsigqueueinfo

sebastian.blanes@gmail.com (1):
      ps3av: Set 16:9 aspect ratio for 720p video modes

 Documentation/kernel-parameters.txt                |    7 +
 Documentation/powerpc/dts-bindings/ecm.txt         |   64 ++
 .../powerpc/dts-bindings/fsl/cpm_qe/qe.txt         |    3 +
 Documentation/powerpc/dts-bindings/fsl/esdhc.txt   |    5 +-
 Documentation/powerpc/dts-bindings/fsl/mcm.txt     |   64 ++
 arch/powerpc/Kconfig                               |   21 +-
 arch/powerpc/Kconfig.debug                         |   13 +
 arch/powerpc/Makefile                              |    1 +
 arch/powerpc/boot/dts/gef_ppc9a.dts                |   14 +-
 arch/powerpc/boot/dts/gef_sbc310.dts               |   14 +-
 arch/powerpc/boot/dts/gef_sbc610.dts               |   14 +-
 arch/powerpc/boot/dts/ksi8560.dts                  |   13 +
 arch/powerpc/boot/dts/mpc832x_mds.dts              |    3 +-
 arch/powerpc/boot/dts/mpc832x_rdb.dts              |    3 +-
 arch/powerpc/boot/dts/mpc8349emitx.dts             |    2 -
 arch/powerpc/boot/dts/mpc8349emitxgp.dts           |    1 -
 arch/powerpc/boot/dts/mpc834x_mds.dts              |    2 -
 arch/powerpc/boot/dts/mpc836x_mds.dts              |    3 +-
 arch/powerpc/boot/dts/mpc836x_rdk.dts              |    2 +
 arch/powerpc/boot/dts/mpc8377_mds.dts              |    1 -
 arch/powerpc/boot/dts/mpc8378_mds.dts              |    1 -
 arch/powerpc/boot/dts/mpc8379_mds.dts              |    1 -
 arch/powerpc/boot/dts/mpc8536ds.dts                |   18 +-
 arch/powerpc/boot/dts/mpc8540ads.dts               |   15 +-
 arch/powerpc/boot/dts/mpc8541cds.dts               |   16 +-
 arch/powerpc/boot/dts/mpc8544ds.dts                |   18 +-
 arch/powerpc/boot/dts/mpc8548cds.dts               |   17 +-
 arch/powerpc/boot/dts/mpc8555cds.dts               |   16 +-
 arch/powerpc/boot/dts/mpc8560ads.dts               |   15 +-
 arch/powerpc/boot/dts/mpc8568mds.dts               |   51 +-
 arch/powerpc/boot/dts/mpc8569mds.dts               |  583 +++++++++++
 arch/powerpc/boot/dts/mpc8572ds.dts                |   17 +-
 arch/powerpc/boot/dts/mpc8572ds_36b.dts            |   39 +-
 arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts     |   16 +-
 arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts     |    2 -
 arch/powerpc/boot/dts/mpc8610_hpcd.dts             |   16 +-
 arch/powerpc/boot/dts/mpc8641_hpcn.dts             |   16 +-
 arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts         |  609 +++++++++++
 arch/powerpc/boot/dts/p2020ds.dts                  |  704 +++++++++++++
 arch/powerpc/boot/dts/sbc8349.dts                  |    1 -
 arch/powerpc/boot/dts/sbc8548.dts                  |   16 +-
 arch/powerpc/boot/dts/sbc8560.dts                  |   15 +-
 arch/powerpc/boot/dts/sbc8641d.dts                 |   16 +-
 arch/powerpc/boot/dts/sequoia.dts                  |   22 +
 arch/powerpc/boot/dts/socrates.dts                 |   15 +-
 arch/powerpc/boot/dts/stx_gp3_8560.dts             |   15 +-
 arch/powerpc/boot/dts/tqm8540.dts                  |   15 +-
 arch/powerpc/boot/dts/tqm8541.dts                  |   15 +-
 arch/powerpc/boot/dts/tqm8548-bigflash.dts         |   16 +-
 arch/powerpc/boot/dts/tqm8548.dts                  |   16 +-
 arch/powerpc/boot/dts/tqm8555.dts                  |   15 +-
 arch/powerpc/boot/dts/tqm8560.dts                  |   15 +-
 arch/powerpc/boot/dts/virtex440-ml510.dts          |  465 +++++++++
 arch/powerpc/boot/dts/warp.dts                     |   27 +-
 arch/powerpc/boot/install.sh                       |    3 +
 arch/powerpc/configs/40x/acadia_defconfig          |    2 +-
 arch/powerpc/configs/40x/ep405_defconfig           |    2 +-
 arch/powerpc/configs/40x/kilauea_defconfig         |   81 ++-
 arch/powerpc/configs/40x/makalu_defconfig          |   81 ++-
 arch/powerpc/configs/40x/virtex_defconfig          |    2 +-
 arch/powerpc/configs/44x/arches_defconfig          |    2 +-
 arch/powerpc/configs/44x/bamboo_defconfig          |    2 +-
 arch/powerpc/configs/44x/canyonlands_defconfig     |    6 +-
 arch/powerpc/configs/44x/ebony_defconfig           |    2 +-
 arch/powerpc/configs/44x/katmai_defconfig          |    2 +-
 arch/powerpc/configs/44x/rainier_defconfig         |    2 +-
 arch/powerpc/configs/44x/redwood_defconfig         |    2 +-
 arch/powerpc/configs/44x/sam440ep_defconfig        |    2 +-
 arch/powerpc/configs/44x/sequoia_defconfig         |  111 ++-
 arch/powerpc/configs/44x/taishan_defconfig         |    2 +-
 arch/powerpc/configs/44x/virtex5_defconfig         |    2 +-
 arch/powerpc/include/asm/atomic.h                  |    3 +
 arch/powerpc/include/asm/cpm2.h                    |    4 -
 arch/powerpc/include/asm/dma-mapping.h             |   11 +
 arch/powerpc/include/asm/elf.h                     |    4 +-
 arch/powerpc/include/asm/emulated_ops.h            |   73 ++
 arch/powerpc/include/asm/feature-fixups.h          |   25 +-
 arch/powerpc/include/asm/hw_irq.h                  |    5 +-
 arch/powerpc/include/asm/iommu.h                   |   10 +
 arch/powerpc/include/asm/lppaca.h                  |    6 +
 arch/powerpc/include/asm/machdep.h                 |    4 +
 arch/powerpc/include/asm/mmu.h                     |    9 +-
 arch/powerpc/include/asm/mpc86xx.h                 |   33 -
 arch/powerpc/include/asm/paca.h                    |   12 +-
 arch/powerpc/include/asm/page.h                    |    5 +
 arch/powerpc/include/asm/pci-bridge.h              |   13 +-
 arch/powerpc/include/asm/pgtable-ppc64.h           |    5 +
 arch/powerpc/include/asm/ppc-opcode.h              |   25 +-
 arch/powerpc/include/asm/ppc_asm.h                 |   10 -
 arch/powerpc/include/asm/ps3.h                     |   18 +-
 arch/powerpc/include/asm/ps3gpu.h                  |   86 ++
 arch/powerpc/include/asm/ptrace.h                  |    4 +
 arch/powerpc/include/asm/qe.h                      |   21 +-
 arch/powerpc/include/asm/reg.h                     |    4 +-
 arch/powerpc/include/asm/scatterlist.h             |    6 +-
 arch/powerpc/include/asm/swiotlb.h                 |   27 +
 arch/powerpc/include/asm/systbl.h                  |    1 +
 arch/powerpc/include/asm/system.h                  |    2 +-
 arch/powerpc/include/asm/unistd.h                  |    3 +-
 arch/powerpc/include/asm/xilinx_pci.h              |   21 +
 arch/powerpc/kernel/Makefile                       |    6 +-
 arch/powerpc/kernel/align.c                        |   20 +-
 arch/powerpc/kernel/asm-offsets.c                  |   32 +-
 arch/powerpc/kernel/cputable.c                     |    6 +-
 arch/powerpc/kernel/dma-swiotlb.c                  |  163 +++
 arch/powerpc/kernel/dma.c                          |    2 +-
 arch/powerpc/kernel/exceptions-64s.S               |  978 +++++++++++++++++
 arch/powerpc/kernel/ftrace.c                       |   29 +-
 arch/powerpc/kernel/head_32.S                      |  101 +--
 arch/powerpc/kernel/head_64.S                      | 1095 +-------------------
 arch/powerpc/kernel/head_booke.h                   |   10 +-
 arch/powerpc/kernel/irq.c                          |  127 ++--
 arch/powerpc/kernel/lparcfg.c                      |   40 +-
 arch/powerpc/kernel/misc_64.S                      |   92 --
 arch/powerpc/kernel/paca.c                         |   14 +-
 arch/powerpc/kernel/pci-common.c                   |    3 +-
 arch/powerpc/kernel/pci_32.c                       |   19 -
 arch/powerpc/kernel/pci_64.c                       |   17 +-
 arch/powerpc/kernel/pci_dn.c                       |   28 +-
 arch/powerpc/kernel/process.c                      |    2 +-
 arch/powerpc/kernel/prom.c                         |    2 +-
 arch/powerpc/kernel/ptrace.c                       |   23 +-
 arch/powerpc/kernel/rtas_pci.c                     |   10 +-
 arch/powerpc/kernel/setup_32.c                     |    6 +
 arch/powerpc/kernel/setup_64.c                     |   15 +-
 arch/powerpc/kernel/time.c                         |   31 +-
 arch/powerpc/kernel/traps.c                        |  130 +++-
 arch/powerpc/kernel/vector.S                       |  210 ++++
 arch/powerpc/mm/Makefile                           |    7 +-
 arch/powerpc/mm/hash_native_64.c                   |   13 +-
 arch/powerpc/mm/init_64.c                          |    2 +
 arch/powerpc/mm/mmu_context_nohash.c               |   19 +-
 arch/powerpc/mm/numa.c                             |    2 +
 arch/powerpc/oprofile/op_model_fsl_emb.c           |   14 -
 arch/powerpc/platforms/40x/Kconfig                 |    2 +
 arch/powerpc/platforms/40x/Makefile                |    2 -
 arch/powerpc/platforms/40x/kilauea.c               |   60 --
 arch/powerpc/platforms/40x/makalu.c                |   60 --
 arch/powerpc/platforms/40x/ppc40x_simple.c         |    5 +-
 arch/powerpc/platforms/40x/virtex.c                |    2 +
 arch/powerpc/platforms/44x/Kconfig                 |   13 +-
 arch/powerpc/platforms/44x/Makefile                |    1 +
 arch/powerpc/platforms/44x/virtex.c                |    2 +
 arch/powerpc/platforms/44x/virtex_ml510.c          |   29 +
 arch/powerpc/platforms/44x/warp.c                  |   76 +-
 arch/powerpc/platforms/52xx/efika.c                |    4 +-
 arch/powerpc/platforms/52xx/mpc52xx_pci.c          |    4 +-
 arch/powerpc/platforms/82xx/pq2ads.h               |   13 -
 arch/powerpc/platforms/85xx/Kconfig                |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_ds.c           |   43 +-
 arch/powerpc/platforms/85xx/mpc85xx_mds.c          |   52 +-
 arch/powerpc/platforms/86xx/gef_ppc9a.c            |    1 -
 arch/powerpc/platforms/86xx/gef_sbc310.c           |    1 -
 arch/powerpc/platforms/86xx/gef_sbc610.c           |    1 -
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c         |    1 -
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c         |    1 -
 arch/powerpc/platforms/86xx/mpc86xx_smp.c          |    8 +-
 arch/powerpc/platforms/86xx/sbc8641d.c             |    1 -
 arch/powerpc/platforms/8xx/mpc885ads.h             |    4 -
 arch/powerpc/platforms/Kconfig                     |    4 +
 arch/powerpc/platforms/Kconfig.cputype             |   26 +-
 arch/powerpc/platforms/cell/axon_msi.c             |    4 +-
 arch/powerpc/platforms/cell/celleb_pci.c           |   10 +-
 arch/powerpc/platforms/cell/celleb_scc_epci.c      |   13 +-
 arch/powerpc/platforms/cell/celleb_scc_pciex.c     |   12 +-
 arch/powerpc/platforms/cell/iommu.c                |   37 +-
 arch/powerpc/platforms/cell/spufs/inode.c          |    6 -
 arch/powerpc/platforms/chrp/pci.c                  |    8 +-
 arch/powerpc/platforms/fsl_uli1575.c               |   24 +-
 arch/powerpc/platforms/iseries/dt.c                |    3 +-
 arch/powerpc/platforms/iseries/iommu.c             |    2 +-
 arch/powerpc/platforms/iseries/mf.c                |    3 +-
 arch/powerpc/platforms/iseries/pci.c               |    8 +-
 arch/powerpc/platforms/powermac/pic.c              |    2 +-
 arch/powerpc/platforms/powermac/setup.c            |    2 +-
 arch/powerpc/platforms/ps3/mm.c                    |   12 +-
 arch/powerpc/platforms/ps3/os-area.c               |  142 ++--
 arch/powerpc/platforms/ps3/platform.h              |   10 -
 arch/powerpc/platforms/ps3/setup.c                 |    1 +
 arch/powerpc/platforms/ps3/smp.c                   |   16 +-
 arch/powerpc/platforms/ps3/system-bus.c            |   15 +-
 arch/powerpc/platforms/pseries/iommu.c             |    4 +-
 arch/powerpc/platforms/pseries/lpar.c              |   52 +
 arch/powerpc/platforms/pseries/rtasd.c             |   76 +-
 arch/powerpc/platforms/pseries/setup.c             |   25 +
 arch/powerpc/sysdev/Makefile                       |    1 +
 arch/powerpc/sysdev/cpm2.c                         |    2 +-
 arch/powerpc/sysdev/fsl_msi.c                      |    9 +-
 arch/powerpc/sysdev/fsl_pci.c                      |  138 +++-
 arch/powerpc/sysdev/fsl_pci.h                      |    6 +-
 arch/powerpc/sysdev/fsl_rio.c                      |   15 +-
 arch/powerpc/sysdev/fsl_soc.c                      |   14 +-
 arch/powerpc/sysdev/indirect_pci.c                 |    4 +-
 arch/powerpc/sysdev/mpic.c                         |   23 +-
 arch/powerpc/sysdev/ppc4xx_pci.c                   |    4 +-
 arch/powerpc/sysdev/qe_lib/qe.c                    |   75 ++-
 arch/powerpc/sysdev/tsi108_pci.c                   |    4 +-
 arch/powerpc/sysdev/xilinx_intc.c                  |   81 ++-
 arch/powerpc/sysdev/xilinx_pci.c                   |  132 +++
 arch/powerpc/xmon/xmon.c                           |   47 +
 drivers/block/ps3disk.c                            |   18 +-
 drivers/block/ps3vram.c                            |  168 ++--
 drivers/char/ps3flash.c                            |  296 +++---
 drivers/char/viotape.c                             |    2 +-
 drivers/i2c/busses/i2c-ibm_iic.c                   |    6 +-
 drivers/macintosh/therm_adt746x.c                  |    4 +-
 drivers/net/ps3_gelic_net.c                        |    8 +-
 drivers/net/ucc_geth.c                             |   24 +-
 drivers/net/ucc_geth.h                             |    4 +-
 drivers/of/base.c                                  |    1 +
 drivers/pci/Makefile                               |    1 -
 drivers/ps3/ps3-sys-manager.c                      |    2 +-
 drivers/ps3/ps3av.c                                |    8 +-
 drivers/ps3/ps3av_cmd.c                            |    3 +-
 drivers/rapidio/rio-scan.c                         |    6 +-
 drivers/usb/host/ehci-ps3.c                        |    7 +-
 drivers/usb/host/ohci-ps3.c                        |    7 +-
 drivers/video/ps3fb.c                              |  272 ++---
 drivers/video/xilinxfb.c                           |  290 +++---
 include/asm-generic/atomic64.h                     |   42 +
 include/linux/bio.h                                |    5 +
 include/linux/pci_ids.h                            |    4 +
 lib/Kconfig                                        |    6 +
 lib/Makefile                                       |    2 +
 lib/atomic64.c                                     |  175 ++++
 225 files changed, 7064 insertions(+), 2884 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/ecm.txt
 create mode 100644 Documentation/powerpc/dts-bindings/fsl/mcm.txt
 create mode 100644 arch/powerpc/boot/dts/mpc8569mds.dts
 create mode 100644 arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts
 create mode 100644 arch/powerpc/boot/dts/p2020ds.dts
 create mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts
 create mode 100644 arch/powerpc/include/asm/emulated_ops.h
 delete mode 100644 arch/powerpc/include/asm/mpc86xx.h
 create mode 100644 arch/powerpc/include/asm/ps3gpu.h
 create mode 100644 arch/powerpc/include/asm/swiotlb.h
 create mode 100644 arch/powerpc/include/asm/xilinx_pci.h
 create mode 100644 arch/powerpc/kernel/dma-swiotlb.c
 create mode 100644 arch/powerpc/kernel/exceptions-64s.S
 delete mode 100644 arch/powerpc/platforms/40x/kilauea.c
 delete mode 100644 arch/powerpc/platforms/40x/makalu.c
 create mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c
 create mode 100644 arch/powerpc/sysdev/xilinx_pci.c
 create mode 100644 include/asm-generic/atomic64.h
 create mode 100644 lib/atomic64.c

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

[Benjamin Herrenschmidt]

On Mon, 2009-06-15 at 12:09 +1000, Benjamin Herrenschmidt wrote:
> Hi Linus !
> 
> Here's the first half of the powerpc merge for 2.6.31. I'll have the
> rest in a couple of days, just dealing with some of my own backlog here
> plus some collisions.

 .../...

>   git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next

Use "merge" not "next" please. I added some more stuff in "next" after
that request that need to sit a bit before you pull it, I didn't notice
that git request-pull picked up the wrong branch :-)

Cheers,
Ben.

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's the first half of the powerpc merge for 2.6.31. I'll have the
rest in a couple of days, just dealing with some of my own backlog here
plus some collisions.

The few things outside of arch/powerpc are powerpc-specific drivers (and
an addition to pci_ids.h). There's also a cleanup of
drivers/pci/Makefile removing another unused ppc specific bit.

No major highlight this time around. Lots of minor fixes, tweaks and
cleanups, swiotlb is now available on some crazy embedded platforms (not
something to be -that- happy about), some new embedded boards, ...

There's a rather big ps3 update queued up for the next batch, but it
didn't make it here. Pauls atomic64_t for 32-bit platforms is in the
next batch too. Hopefully I'll have it ready for you in a day or two (I
want to let it simmer in -next for a couple of days).

Cheers,
Ben.
  
The following changes since commit 45e3e1935e2857c54783291107d33323b3ef33c8:
  Linus Torvalds (1):
        Merge branch 'master' of git://git.kernel.org/.../sam/kbuild-next

are available in the git repository at:

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

Anton Blanchard (2):
      powerpc: Improve decrementer accuracy
      powerpc: Convert RTAS event scan from kernel thread to workqueue

Anton Vorontsov (6):
      powerpc/85xx: Add PCI IDs for MPC8569 family processors
      powerpc/85xx: Fix mpc8569emds crypto node to include SNOW unit
      powerpc/85xx: Fix reg & interrupts for mpc8569emds localbus added NAND
      powerpc/85xx: Add eSDHC support for MPC8569E-MDS boards
      powerpc/85xx: Enable Serial RapidIO for MPC85xx MDS boards
      powerpc/85xx: Add STMicro M25P40 serial flash support for MPC8569E-MDS

Becky Bruce (4):
      powerpc/86xx: Add 36-bit device tree for mpc8641hpcn
      powerpc: make dma_window_* in pci_controller struct avail on 32b
      powerpc: Use sg->dma_length in sg_dma_len() macro on 32-bit
      powerpc: Add support for swiotlb on 32-bit

Benjamin Herrenschmidt (12):
      Merge branch 'merge' into next
      powerpc/mm: Fix some SMP issues with MMU context handling
      powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
      powerpc: Set init_bootmem_done on NUMA platforms as well
      powerpc: Move VMX and VSX asm code to vector.S
      powerpc: Introduce CONFIG_PPC_BOOK3S
      powerpc: Split exception handling out of head_64.S
      powerpc: Separate PACA fields for server CPUs
      powerpc: Shield code specific to 64-bit server processors
      Merge commit 'jwb/next' into next
      powerpc: Fix bug in move of altivec code to vector.S
      Merge commit 'origin/master' into next

Geert Uytterhoeven (1):
      powerpc: Keep track of emulated instructions

Geoff Levand (1):
      powerpc/ps3: Use smp_request_message_ipi

Grant Likely (1):
      powerpc/virtex: refactor intc driver and add support for i8259 cascading

Haiying Wang (7):
      powerpc/85xx: clean up for mpc8568_mds name
      powerpc/qe: update risc allocation for QE
      net/ucc_geth: update riscTx and riscRx in ucc_geth
      powerpc/qe: update QE Serial Number
      net/ucc_geth: Assign six threads to Rx for UEC
      powerpc/85xx: Add MPC8569MDS board support
      powerpc/qe: add new qe properties for QE based chips

Jan Blunck (1):
      powerpc/spufs: Remove double check for non-negative dentry

John Linn (1):
      fbdev: Add PLB support and cleanup DCR in xilinxfb driver.

Josh Boyer (3):
      powerpc/4xx: Disable PCI_LEGACY
      powerpc/40x: Convert AMCC Makalu board to ppc40x_simple
      powerpc/40x: Convert AMCC Kilauea/Halekala boards to ppc40x_simple

Kumar Gala (32):
      powerpc/fsl: Remove cell-index from PCI nodes
      powerpc: Refactor board check for PCI quirks on FSL boards with uli1575
      powerpc/fsl: use of_iomap() for rstcr mapping
      powerpc/85xx: Add binding for LAWs and ECM
      powerpc/85xx: Add new LAW & ECM device tree nodes for all 85xx systems
      powerpc/86xx: Add binding for LAWs and MCM
      powerpc/86xx: Add new LAW & MCM device tree nodes for all 86xx systems
      powerpc/cpm: Remove some cruft code and defines
      powerpc/86xx: clean up smp init code
      powerpc/fsl: Removed reg property from 85xx/86xx soc node
      fsldma: Fix compile warnings
      powerpc/85xx: Add MSI nodes for MPC8568/9 MDS systems
      powerpc/fsl: Support unique MSI addresses per PCIe Root Complex
      powerpc/8xxx: Update PCI outbound window addresses for 36-bit configs
      powerpc/fsl_rio: Fix compile warnings
      powerpc/fsl: Update FSL esdhc binding
      powerpc/85xx: Add P2020DS board support
      powerpc/fsl: Setup PCI inbound window based on actual amount of memory
      powerpc: Fix up elf_read_implies_exec() usage
      powerpc/pci: Clean up direct access to sysdata by indirect ops
      powerpc/pci: Clean up direct access to sysdata by FSL platforms
      powerpc/pci: Clean up direct access to sysdata by 52xx platforms
      powerpc/pci: Clean up direct access to sysdata by 4xx platforms
      powerpc/pci: Clean up direct access to sysdata by CHRP platforms
      powerpc/pci: Clean up direct access to sysdata on tsi108 platforms
      powerpc/pci: Clean up direct access to sysdata by powermac platforms
      powerpc/pci: Clean up direct access to sysdata by RTAS
      powerpc/pci: Clean up direct access to sysdata by celleb platforms
      powerpc/pci: Move pseries code into pseries platform specific area
      powerpc/pci: Cleanup some minor cruft
      powerpc/pci: Remove redundant pcnet32 fixup
      powerpc/pci: clean up direct access to sysdata by iseries platform

Li Yang (2):
      powerpc/fsl_rio: use LAW address from device tree
      rapidio: fix section mismatch warnings

Michael Ellerman (10):
      powerpc/oprofile: Remove unused dump_pmcs() in FSL oprofile
      powerpc/irq: Move #ifdef'ed body of do_IRQ() into a separate function
      powerpc/irq: Move stack overflow check into a separate function
      powerpc/irq: Move get_irq() comment into header
      powerpc/irq: Remove fallback to __do_IRQ()
      powerpc/powermac: Use generic_handle_irq() in gatwick_action()
      powerpc/irq: We don't need __do_IRQ() anymore
      powerpc/ftrace: Use ppc_function_entry() instead of GET_ADDR
      powerpc/ftrace: Remove unused macros
      powerpc/ftrace: Use PPC_INST_NOP directly

Michael Neuling (3):
      powerpc: Cleanup macros in ppc-opcode.h
      powerpc: Move VSX load/stores into ppc-opcode.h
      powerpc: Make the NR_CPUS max 8192

Michel Dänzer (1):
      therm_adt746x: Always clear hardware bit which inverts fan speed range.

Milton Miller (2):
      powerpc: Enable MMU feature sections for inline asm
      powerpc: Add 2.06 tlbie mnemonics

Nathan Fontenot (1):
      powerpc: Display processor virtualization resource allocs in lparcfg

Robert Jennings (1):
      powerpc/pseries: CMO unused page hinting

Roderick Colenbrander (3):
      powerpc/virtex: Add support for Xilinx PCI host bridge
      powerpc/virtex: Add Xilinx ML510 reference design support
      powerpc/virtex: Add ml510 reference design device tree

Roland McGrath (1):
      powerpc: Add PTRACE_SINGLEBLOCK support

Sean MacLennan (2):
      powerpc: Update Warp to use leds-gpio driver
      i2c: Fix confusing i2c-ibm_iic message

Stefan Roese (1):
      powerpc/4xx: Sequoia: Enable NAND support

Stephen Rothwell (5):
      powerpc/pci: Fix annotation of pcibios_claim_one_bus
      powerpc/pseries: Fix warnings when printing resource_size_t
      powerpc/xmon: Remove unused variable in xmon.c
      powerpc: Fix warning when printing a resource_size_t
      powerpc/spufs: Remove unused error path

Tony Breeds (1):
      powerpc/mpic: Cleanup mpic_find() implementation

Vinay Sridhar (1):
      powerpc/xmon: Add dl command to dump contents of __log_buf

roel kluin (1):
      tape: beyond ARRAY_SIZE of viocd_diskinfo

 Documentation/kernel-parameters.txt                |    7 +
 Documentation/powerpc/dts-bindings/ecm.txt         |   64 ++
 .../powerpc/dts-bindings/fsl/cpm_qe/qe.txt         |    3 +
 Documentation/powerpc/dts-bindings/fsl/esdhc.txt   |    5 +-
 Documentation/powerpc/dts-bindings/fsl/mcm.txt     |   64 ++
 arch/powerpc/Kconfig                               |   16 +-
 arch/powerpc/Kconfig.debug                         |   13 +
 arch/powerpc/Makefile                              |    1 +
 arch/powerpc/boot/dts/gef_ppc9a.dts                |   14 +-
 arch/powerpc/boot/dts/gef_sbc310.dts               |   14 +-
 arch/powerpc/boot/dts/gef_sbc610.dts               |   14 +-
 arch/powerpc/boot/dts/ksi8560.dts                  |   13 +
 arch/powerpc/boot/dts/mpc832x_mds.dts              |    3 +-
 arch/powerpc/boot/dts/mpc832x_rdb.dts              |    3 +-
 arch/powerpc/boot/dts/mpc8349emitx.dts             |    2 -
 arch/powerpc/boot/dts/mpc8349emitxgp.dts           |    1 -
 arch/powerpc/boot/dts/mpc834x_mds.dts              |    2 -
 arch/powerpc/boot/dts/mpc836x_mds.dts              |    3 +-
 arch/powerpc/boot/dts/mpc836x_rdk.dts              |    2 +
 arch/powerpc/boot/dts/mpc8377_mds.dts              |    1 -
 arch/powerpc/boot/dts/mpc8378_mds.dts              |    1 -
 arch/powerpc/boot/dts/mpc8379_mds.dts              |    1 -
 arch/powerpc/boot/dts/mpc8536ds.dts                |   18 +-
 arch/powerpc/boot/dts/mpc8540ads.dts               |   15 +-
 arch/powerpc/boot/dts/mpc8541cds.dts               |   16 +-
 arch/powerpc/boot/dts/mpc8544ds.dts                |   18 +-
 arch/powerpc/boot/dts/mpc8548cds.dts               |   17 +-
 arch/powerpc/boot/dts/mpc8555cds.dts               |   16 +-
 arch/powerpc/boot/dts/mpc8560ads.dts               |   15 +-
 arch/powerpc/boot/dts/mpc8568mds.dts               |   51 +-
 arch/powerpc/boot/dts/mpc8569mds.dts               |  583 +++++++++++
 arch/powerpc/boot/dts/mpc8572ds.dts                |   17 +-
 arch/powerpc/boot/dts/mpc8572ds_36b.dts            |   39 +-
 arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts     |   16 +-
 arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts     |    2 -
 arch/powerpc/boot/dts/mpc8610_hpcd.dts             |   16 +-
 arch/powerpc/boot/dts/mpc8641_hpcn.dts             |   16 +-
 arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts         |  609 +++++++++++
 arch/powerpc/boot/dts/p2020ds.dts                  |  704 +++++++++++++
 arch/powerpc/boot/dts/sbc8349.dts                  |    1 -
 arch/powerpc/boot/dts/sbc8548.dts                  |   16 +-
 arch/powerpc/boot/dts/sbc8560.dts                  |   15 +-
 arch/powerpc/boot/dts/sbc8641d.dts                 |   16 +-
 arch/powerpc/boot/dts/sequoia.dts                  |   22 +
 arch/powerpc/boot/dts/socrates.dts                 |   15 +-
 arch/powerpc/boot/dts/stx_gp3_8560.dts             |   15 +-
 arch/powerpc/boot/dts/tqm8540.dts                  |   15 +-
 arch/powerpc/boot/dts/tqm8541.dts                  |   15 +-
 arch/powerpc/boot/dts/tqm8548-bigflash.dts         |   16 +-
 arch/powerpc/boot/dts/tqm8548.dts                  |   16 +-
 arch/powerpc/boot/dts/tqm8555.dts                  |   15 +-
 arch/powerpc/boot/dts/tqm8560.dts                  |   15 +-
 arch/powerpc/boot/dts/virtex440-ml510.dts          |  465 +++++++++
 arch/powerpc/boot/dts/warp.dts                     |   27 +-
 arch/powerpc/configs/40x/acadia_defconfig          |    2 +-
 arch/powerpc/configs/40x/ep405_defconfig           |    2 +-
 arch/powerpc/configs/40x/kilauea_defconfig         |   81 ++-
 arch/powerpc/configs/40x/makalu_defconfig          |   81 ++-
 arch/powerpc/configs/40x/virtex_defconfig          |    2 +-
 arch/powerpc/configs/44x/arches_defconfig          |    2 +-
 arch/powerpc/configs/44x/bamboo_defconfig          |    2 +-
 arch/powerpc/configs/44x/canyonlands_defconfig     |    6 +-
 arch/powerpc/configs/44x/ebony_defconfig           |    2 +-
 arch/powerpc/configs/44x/katmai_defconfig          |    2 +-
 arch/powerpc/configs/44x/rainier_defconfig         |    2 +-
 arch/powerpc/configs/44x/redwood_defconfig         |    2 +-
 arch/powerpc/configs/44x/sam440ep_defconfig        |    2 +-
 arch/powerpc/configs/44x/sequoia_defconfig         |  111 ++-
 arch/powerpc/configs/44x/taishan_defconfig         |    2 +-
 arch/powerpc/configs/44x/virtex5_defconfig         |    2 +-
 arch/powerpc/include/asm/cpm2.h                    |    4 -
 arch/powerpc/include/asm/dma-mapping.h             |   11 +
 arch/powerpc/include/asm/elf.h                     |    4 +-
 arch/powerpc/include/asm/emulated_ops.h            |   73 ++
 arch/powerpc/include/asm/feature-fixups.h          |   25 +-
 arch/powerpc/include/asm/lppaca.h                  |    6 +
 arch/powerpc/include/asm/machdep.h                 |    4 +
 arch/powerpc/include/asm/mmu.h                     |    9 +-
 arch/powerpc/include/asm/mpc86xx.h                 |   33 -
 arch/powerpc/include/asm/paca.h                    |   12 +-
 arch/powerpc/include/asm/page.h                    |    5 +
 arch/powerpc/include/asm/pci-bridge.h              |   13 +-
 arch/powerpc/include/asm/pgtable-ppc64.h           |    5 +
 arch/powerpc/include/asm/ppc-opcode.h              |   25 +-
 arch/powerpc/include/asm/ppc_asm.h                 |   10 -
 arch/powerpc/include/asm/ptrace.h                  |    4 +
 arch/powerpc/include/asm/qe.h                      |   21 +-
 arch/powerpc/include/asm/scatterlist.h             |    6 +-
 arch/powerpc/include/asm/swiotlb.h                 |   27 +
 arch/powerpc/include/asm/system.h                  |    2 +-
 arch/powerpc/include/asm/xilinx_pci.h              |   21 +
 arch/powerpc/kernel/Makefile                       |    4 +-
 arch/powerpc/kernel/align.c                        |   20 +-
 arch/powerpc/kernel/asm-offsets.c                  |   32 +-
 arch/powerpc/kernel/cputable.c                     |    6 +-
 arch/powerpc/kernel/dma-swiotlb.c                  |  163 +++
 arch/powerpc/kernel/dma.c                          |    2 +-
 arch/powerpc/kernel/exceptions-64s.S               |  978 +++++++++++++++++
 arch/powerpc/kernel/ftrace.c                       |   29 +-
 arch/powerpc/kernel/head_32.S                      |  101 +--
 arch/powerpc/kernel/head_64.S                      | 1095 +-------------------
 arch/powerpc/kernel/head_booke.h                   |   10 +-
 arch/powerpc/kernel/irq.c                          |  127 ++--
 arch/powerpc/kernel/lparcfg.c                      |   40 +-
 arch/powerpc/kernel/misc_64.S                      |   92 --
 arch/powerpc/kernel/paca.c                         |   14 +-
 arch/powerpc/kernel/pci-common.c                   |    3 +-
 arch/powerpc/kernel/pci_32.c                       |   19 -
 arch/powerpc/kernel/pci_64.c                       |   17 +-
 arch/powerpc/kernel/pci_dn.c                       |   28 +-
 arch/powerpc/kernel/process.c                      |    2 +-
 arch/powerpc/kernel/prom.c                         |    2 +-
 arch/powerpc/kernel/ptrace.c                       |   23 +-
 arch/powerpc/kernel/rtas_pci.c                     |   10 +-
 arch/powerpc/kernel/setup_32.c                     |    6 +
 arch/powerpc/kernel/setup_64.c                     |   11 +-
 arch/powerpc/kernel/time.c                         |   21 +-
 arch/powerpc/kernel/traps.c                        |  130 +++-
 arch/powerpc/kernel/vector.S                       |  210 ++++
 arch/powerpc/mm/Makefile                           |    7 +-
 arch/powerpc/mm/hash_native_64.c                   |   13 +-
 arch/powerpc/mm/init_64.c                          |    2 +
 arch/powerpc/mm/mmu_context_nohash.c               |   19 +-
 arch/powerpc/mm/numa.c                             |    2 +
 arch/powerpc/oprofile/op_model_fsl_emb.c           |   14 -
 arch/powerpc/platforms/40x/Kconfig                 |    2 +
 arch/powerpc/platforms/40x/Makefile                |    2 -
 arch/powerpc/platforms/40x/kilauea.c               |   60 --
 arch/powerpc/platforms/40x/makalu.c                |   60 --
 arch/powerpc/platforms/40x/ppc40x_simple.c         |    5 +-
 arch/powerpc/platforms/40x/virtex.c                |    2 +
 arch/powerpc/platforms/44x/Kconfig                 |   13 +-
 arch/powerpc/platforms/44x/Makefile                |    1 +
 arch/powerpc/platforms/44x/virtex.c                |    2 +
 arch/powerpc/platforms/44x/virtex_ml510.c          |   29 +
 arch/powerpc/platforms/44x/warp.c                  |   76 +-
 arch/powerpc/platforms/52xx/efika.c                |    4 +-
 arch/powerpc/platforms/52xx/mpc52xx_pci.c          |    4 +-
 arch/powerpc/platforms/82xx/pq2ads.h               |   13 -
 arch/powerpc/platforms/85xx/Kconfig                |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_ds.c           |   43 +-
 arch/powerpc/platforms/85xx/mpc85xx_mds.c          |   52 +-
 arch/powerpc/platforms/86xx/gef_ppc9a.c            |    1 -
 arch/powerpc/platforms/86xx/gef_sbc310.c           |    1 -
 arch/powerpc/platforms/86xx/gef_sbc610.c           |    1 -
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c         |    1 -
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c         |    1 -
 arch/powerpc/platforms/86xx/mpc86xx_smp.c          |    8 +-
 arch/powerpc/platforms/86xx/sbc8641d.c             |    1 -
 arch/powerpc/platforms/8xx/mpc885ads.h             |    4 -
 arch/powerpc/platforms/Kconfig                     |    4 +
 arch/powerpc/platforms/Kconfig.cputype             |   26 +-
 arch/powerpc/platforms/cell/celleb_pci.c           |   10 +-
 arch/powerpc/platforms/cell/celleb_scc_epci.c      |   13 +-
 arch/powerpc/platforms/cell/celleb_scc_pciex.c     |   12 +-
 arch/powerpc/platforms/cell/spufs/inode.c          |    6 -
 arch/powerpc/platforms/chrp/pci.c                  |    8 +-
 arch/powerpc/platforms/fsl_uli1575.c               |   24 +-
 arch/powerpc/platforms/iseries/iommu.c             |    2 +-
 arch/powerpc/platforms/iseries/pci.c               |    8 +-
 arch/powerpc/platforms/powermac/pic.c              |    2 +-
 arch/powerpc/platforms/powermac/setup.c            |    2 +-
 arch/powerpc/platforms/ps3/smp.c                   |   16 +-
 arch/powerpc/platforms/pseries/iommu.c             |    4 +-
 arch/powerpc/platforms/pseries/lpar.c              |   52 +
 arch/powerpc/platforms/pseries/rtasd.c             |   76 +-
 arch/powerpc/platforms/pseries/setup.c             |   25 +
 arch/powerpc/sysdev/Makefile                       |    1 +
 arch/powerpc/sysdev/cpm2.c                         |    2 +-
 arch/powerpc/sysdev/fsl_msi.c                      |    9 +-
 arch/powerpc/sysdev/fsl_pci.c                      |  138 +++-
 arch/powerpc/sysdev/fsl_pci.h                      |    6 +-
 arch/powerpc/sysdev/fsl_rio.c                      |   15 +-
 arch/powerpc/sysdev/fsl_soc.c                      |   14 +-
 arch/powerpc/sysdev/indirect_pci.c                 |    4 +-
 arch/powerpc/sysdev/mpic.c                         |   23 +-
 arch/powerpc/sysdev/ppc4xx_pci.c                   |    4 +-
 arch/powerpc/sysdev/qe_lib/qe.c                    |   75 ++-
 arch/powerpc/sysdev/tsi108_pci.c                   |    4 +-
 arch/powerpc/sysdev/xilinx_intc.c                  |   81 ++-
 arch/powerpc/sysdev/xilinx_pci.c                   |  132 +++
 arch/powerpc/xmon/xmon.c                           |   47 +
 drivers/char/viotape.c                             |    2 +-
 drivers/i2c/busses/i2c-ibm_iic.c                   |    6 +-
 drivers/macintosh/therm_adt746x.c                  |    4 +-
 drivers/net/ucc_geth.c                             |   24 +-
 drivers/net/ucc_geth.h                             |    4 +-
 drivers/of/base.c                                  |    1 +
 drivers/pci/Makefile                               |    1 -
 drivers/rapidio/rio-scan.c                         |    6 +-
 drivers/video/xilinxfb.c                           |  290 +++---
 include/linux/pci_ids.h                            |    4 +
 192 files changed, 6191 insertions(+), 2357 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/ecm.txt
 create mode 100644 Documentation/powerpc/dts-bindings/fsl/mcm.txt
 create mode 100644 arch/powerpc/boot/dts/mpc8569mds.dts
 create mode 100644 arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts
 create mode 100644 arch/powerpc/boot/dts/p2020ds.dts
 create mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts
 create mode 100644 arch/powerpc/include/asm/emulated_ops.h
 delete mode 100644 arch/powerpc/include/asm/mpc86xx.h
 create mode 100644 arch/powerpc/include/asm/swiotlb.h
 create mode 100644 arch/powerpc/include/asm/xilinx_pci.h
 create mode 100644 arch/powerpc/kernel/dma-swiotlb.c
 create mode 100644 arch/powerpc/kernel/exceptions-64s.S
 delete mode 100644 arch/powerpc/platforms/40x/kilauea.c
 delete mode 100644 arch/powerpc/platforms/40x/makalu.c
 create mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c
 create mode 100644 arch/powerpc/sysdev/xilinx_pci.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a defconfig update if you still get things in .30

Cheers,
Ben.

The following changes since commit d9244b5d2fbfe9fa540024b410047af13ceec90f:
  Linus Torvalds (1):
        Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      powerpc/pmac: Update PowerMac 32-bit defconfig

 arch/powerpc/configs/pmac32_defconfig |  278 +++++++++++++++++++++++----------
 1 files changed, 195 insertions(+), 83 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a defconfig update if you still get things in .30

Cheers,
Ben.

The following changes since commit d9244b5d2fbfe9fa540024b410047af13ceec90f:
  Linus Torvalds (1):
        Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      powerpc/pmac: Update PowerMac 32-bit defconfig

 arch/powerpc/configs/pmac32_defconfig |  278 +++++++++++++++++++++++----------
 1 files changed, 195 insertions(+), 83 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus

And here's the rest of the fixes I was talking about. Hopefully that
should bring back all non-coherent DMA platforms into proper working
conditions. It's a bit invasive so late in the process but it's been
reasonably well tested for a few days.

The following changes since commit cd86a536c81e9300d984327517548ca0652eebf9:
  Linus Torvalds (1):
        Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

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

Benjamin Herrenschmidt (4):
      Revert "powerpc: Rework dma-noncoherent to use generic vmalloc layer"
      powerpc: Move dma-noncoherent.c from arch/powerpc/lib to arch/powerpc/mm
      powerpc: Minor cleanups of kernel virt address space definitions
      powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.

 arch/powerpc/Kconfig                     |   12 +
 arch/powerpc/include/asm/dma-mapping.h   |    6 +-
 arch/powerpc/include/asm/fixmap.h        |    4 +-
 arch/powerpc/include/asm/pgtable-ppc32.h |   26 ++-
 arch/powerpc/kernel/dma.c                |    2 +-
 arch/powerpc/lib/Makefile                |    1 -
 arch/powerpc/lib/dma-noncoherent.c       |  237 ------------------
 arch/powerpc/mm/Makefile                 |    1 +
 arch/powerpc/mm/dma-noncoherent.c        |  400 ++++++++++++++++++++++++++++++
 arch/powerpc/mm/init_32.c                |    8 +-
 arch/powerpc/mm/mem.c                    |   17 ++
 arch/powerpc/mm/pgtable_32.c             |    2 -
 12 files changed, 463 insertions(+), 253 deletions(-)
 delete mode 100644 arch/powerpc/lib/dma-noncoherent.c
 create mode 100644 arch/powerpc/mm/dma-noncoherent.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's the first of two fixes for nasty brown paper bag bugs that went
in recently and are both my fault (I need to start buying those bags
in bulk I reckon...)

It's 2.6.30 material. I'll send the second one tomorrow or so after a
bit more review and testing happened as it's unfortunately more
invasive.

The following changes since commit b18f1e21993f73f072b1e0859f942fb11afddcb1:
  Linus Torvalds (1):
        Merge branch 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm

are available in the git repository at:

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

Hideo Saito (1):
      powerpc/mm: Fix broken MMU PID stealing on !SMP

 arch/powerpc/mm/mmu_context_nohash.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a small fix for .30 that works around a regression caused by
enabling MSI support in the IPR driver.

Cheers,
Ben.

The following changes since commit 5805977e63a36ad56594a623f3bd2bebcb7db233:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/drm-2.6

are available in the git repository at:

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

Michael Ellerman (1):
      powerpc/maple: Add a quirk to disable MSI for IPR on Bimini

 arch/powerpc/platforms/maple/pci.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

A few more 2.6.30 things for you... a defconfig update, and a couple
of small fixes, either obvious enough or regression fixes.

Cheers,
Ben.

The following changes since commit 86460103c412f9e11aeb7950cce64b9e51539d4d:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../rafael/suspend-2.6

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      powerpc: Explicit alignment for .data.cacheline_aligned

Geoff Levand (1):
      powerpc/ps3: Update ps3_defconfig

Mel Gorman (1):
      powerpc: Do not assert pte_locked for hugepage PTE entries

Michael Ellerman (1):
      powerpc/ftrace: Use pr_devel() in ftrace.c

Steven Rostedt (1):
      powerpc/ftrace: Fix constraint to be early clobber

 arch/powerpc/configs/ps3_defconfig |  105 +++++++++++++++++++++---------------
 arch/powerpc/kernel/ftrace.c       |   22 ++++----
 arch/powerpc/kernel/vmlinux.lds.S  |    1 +
 arch/powerpc/mm/pgtable.c          |    3 +-
 4 files changed, 76 insertions(+), 55 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are some updates for .30. A bit more than I would have hoped at
this stage in the game, but I've been MIA for a while, first on vacation
and then carried off to a customer issue, and so a lot of this have
actually been around for some time. There are bug fixes and defconfig
updates exclusively (though not all are regressions).

The tree is based on an older -rc3 checkout but it seems to merge fine
with your latest so I didn't feel the need to stick a merge commit
myself in there.

Cheers,
Ben.

The following changes since commit 45d447406a19cbfd42720f066f156f4eb9d68801:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../czankel/xtensa-2.6

are available in the git repository at:

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

Anton Vorontsov (1):
      powerpc/fsl_soc: Remove mpc83xx_wdt_init, again

Becky Bruce (1):
      powerpc: Allow mem=x cmdline to work with 4G+

Benjamin Herrenschmidt (2):
      powerpc/pseries: Really fix the oprofile CPU type on pseries
      powerpc: Fix PCI ROM access

Benjamin Krill (1):
      serial/nwpserial: Fix wrong register read address and add interrupt acknowledge.

Gerhard Stenzel (1):
      powerpc/cell: Make ptcal more reliable

Grant Likely (2):
      powerpc/boot: add simpleImage.* to clean-files list
      powerpc/virtex: Add uImage to the default images list

John Linn (1):
      powerpc/virtex: Fix duplicate level irq events.

Kumar Gala (6):
      powerpc/83xx: Update defconfigs
      powerpc/85xx: Update defconfigs
      powerpc/86xx: Update defconfigs
      powerpc/embedded6xx: Update defconfigs
      powerpc/8xx: Update defconfigs
      powerpc/mpic: Fix incorrect allocation of interrupt rev-map

Maynard Johnson (1):
      powerpc: Fix oprofile sampling of marked events on POWER7

Stephen Rothwell  x (1):
      powerpc/iseries: Fix pci breakage due to bad dma_data initialization

Timur Tabi (1):
      powerpc: Fix mktree build error on Mac OS X host

 arch/powerpc/boot/Makefile                        |    2 +-
 arch/powerpc/boot/mktree.c                        |   10 +-
 arch/powerpc/configs/83xx/asp8347_defconfig       |  104 ++++--
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |  114 +++++--
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |  114 +++++--
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |  107 +++++--
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |  113 +++++--
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |  108 +++++--
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |  108 +++++--
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |  103 ++++--
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |  108 +++++--
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |   96 ++++--
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |  104 +++++--
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |  111 +++++--
 arch/powerpc/configs/83xx/sbc834x_defconfig       |   96 ++++--
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   86 ++++--
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   82 ++++--
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   89 ++++--
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   88 ++++--
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   84 ++++-
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   83 ++++--
 arch/powerpc/configs/85xx/socrates_defconfig      |  385 ++++++++++++++++-----
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |  105 +++++--
 arch/powerpc/configs/85xx/tqm8540_defconfig       |  100 ++++--
 arch/powerpc/configs/85xx/tqm8541_defconfig       |  101 ++++--
 arch/powerpc/configs/85xx/tqm8548_defconfig       |   64 +++-
 arch/powerpc/configs/85xx/tqm8555_defconfig       |  101 ++++--
 arch/powerpc/configs/85xx/tqm8560_defconfig       |  101 ++++--
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig     |   92 ++++--
 arch/powerpc/configs/86xx/gef_sbc310_defconfig    |   92 ++++--
 arch/powerpc/configs/86xx/gef_sbc610_defconfig    |  122 +++++--
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig  |  100 ++++--
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig  |  211 +++++-------
 arch/powerpc/configs/86xx/sbc8641d_defconfig      |  114 +++++--
 arch/powerpc/configs/adder875_defconfig           |   65 +++-
 arch/powerpc/configs/c2k_defconfig                |  128 +++++--
 arch/powerpc/configs/ep8248e_defconfig            |   74 +++--
 arch/powerpc/configs/ep88xc_defconfig             |   63 +++-
 arch/powerpc/configs/linkstation_defconfig        |   96 ++++--
 arch/powerpc/configs/mgcoge_defconfig             |   74 +++-
 arch/powerpc/configs/mgsuvd_defconfig             |   72 +++-
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |   91 ++++--
 arch/powerpc/configs/mpc8272_ads_defconfig        |   77 +++--
 arch/powerpc/configs/mpc83xx_defconfig            |  115 +++++--
 arch/powerpc/configs/mpc866_ads_defconfig         |   77 +++--
 arch/powerpc/configs/mpc86xx_defconfig            |  211 +++++-------
 arch/powerpc/configs/mpc885_ads_defconfig         |   63 +++-
 arch/powerpc/configs/pq2fads_defconfig            |   90 ++++--
 arch/powerpc/configs/prpmc2800_defconfig          |  120 +++++--
 arch/powerpc/configs/storcenter_defconfig         |   71 +++-
 arch/powerpc/include/asm/iseries/iommu.h          |    4 -
 arch/powerpc/include/asm/system.h                 |    2 +-
 arch/powerpc/kernel/cputable.c                    |    2 +-
 arch/powerpc/kernel/machine_kexec.c               |    4 +-
 arch/powerpc/kernel/pci-common.c                  |   21 +-
 arch/powerpc/kernel/pci_64.c                      |   15 +-
 arch/powerpc/kernel/prom.c                        |    8 +-
 arch/powerpc/mm/mem.c                             |    2 +-
 arch/powerpc/oprofile/op_model_power4.c           |    9 +-
 arch/powerpc/platforms/40x/Kconfig                |    1 +
 arch/powerpc/platforms/44x/Kconfig                |    1 +
 arch/powerpc/platforms/cell/ras.c                 |   17 +-
 arch/powerpc/platforms/iseries/iommu.c            |    6 +-
 arch/powerpc/platforms/iseries/pci.c              |    1 -
 arch/powerpc/sysdev/fsl_soc.c                     |   46 ---
 arch/powerpc/sysdev/mpic.c                        |   16 +-
 arch/powerpc/sysdev/xilinx_intc.c                 |  117 ++++++-
 drivers/serial/nwpserial.c                        |    4 +-
 68 files changed, 3819 insertions(+), 1542 deletions(-)

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

[Grant Likely]

Hey Ben,

Can you please also pull in my merge branch?

http://ozlabs.org/pipermail/linuxppc-dev/2009-May/071626.html

Thanks,
g.

On Mon, May 4, 2009 at 10:55 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> Hi Linus !
>
> Here are a few things still for .30 for you to merge !
>
> Cheers,
> Ben.
>
> The following changes since commit 091438dd5668396328a3419abcbc6591159eb8d1:
>  Linus Torvalds (1):
>        Linux 2.6.30-rc4
>
> are available in the git repository at:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
>
> Benjamin Herrenschmidt (1):
>      powerpc: Fix setting of oprofile cpu type
>
> Grant Likely (1):
>      powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries
>
> Michael Wolf (1):
>      powerpc adjust oprofile_cpu_type version 3
>
>  MAINTAINERS                    |    4 ++--
>  arch/powerpc/kernel/cputable.c |   15 ++++++++++-----
>  2 files changed, 12 insertions(+), 7 deletions(-)
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are a few things still for .30 for you to merge !

Cheers,
Ben.

The following changes since commit 091438dd5668396328a3419abcbc6591159eb8d1:
  Linus Torvalds (1):
        Linux 2.6.30-rc4

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      powerpc: Fix setting of oprofile cpu type

Grant Likely (1):
      powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries

Michael Wolf (1):
      powerpc adjust oprofile_cpu_type version 3

 MAINTAINERS                    |    4 ++--
 arch/powerpc/kernel/cputable.c |   15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

[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 bug fixes for powerpc.

Thanks,
Paul.

 MAINTAINERS                           |    2 +
 arch/powerpc/boot/4xx.c               |   56 +++++++++++++++++++++++++--------
 arch/powerpc/boot/dts/gef_ppc9a.dts   |    1 +
 arch/powerpc/include/asm/elf.h        |    1 +
 arch/powerpc/include/asm/mmu.h        |    6 ----
 arch/powerpc/include/asm/ppc-opcode.h |   11 +-----
 arch/powerpc/kernel/cputable.c        |    2 +
 arch/powerpc/mm/tlb_nohash_low.S      |   16 +--------
 arch/powerpc/platforms/cell/Kconfig   |    5 ++-
 arch/powerpc/platforms/ps3/setup.c    |    4 --
 10 files changed, 54 insertions(+), 50 deletions(-)

Geoff Levand (1):
      powerpc/ps3: Fix build error on UP

Josh Boyer (1):
      maintainers: Fix PowerPC 4xx git tree

Kumar Gala (2):
      Revert "powerpc: Add support for early tlbilx opcode"
      powerpc: ppc32 needs elf_read_implies_exec()

Martyn Welch (1):
      powerpc/86xx: Add device_type entry to soc for ppc9a

Michael Ellerman (1):
      powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB

Stephen Rothwell (1):
      powerpc: fix for long standing bug noticed by gcc 4.4.0

Valentine Barshak (1):
      powerpc/44x: Correct memory size calculation for denali-based boards

[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 bug fixes for powerpc, plus some documentation and
defconfig updates and a MAINTAINERS update.

Thanks,
Paul.

 Documentation/powerpc/booting-without-of.txt       |   89 -
 Documentation/powerpc/dts-bindings/mtd-physmap.txt |   80 +
 MAINTAINERS                                        |    5 
 arch/powerpc/boot/dts/lite5200b.dts                |   39 
 arch/powerpc/configs/52xx/cm5200_defconfig         |   69 +
 arch/powerpc/configs/52xx/lite5200b_defconfig      |   74 +
 arch/powerpc/configs/52xx/motionpro_defconfig      |   77 +
 arch/powerpc/configs/52xx/pcm030_defconfig         |   69 +
 arch/powerpc/configs/52xx/tqm5200_defconfig        |   76 +
 arch/powerpc/configs/85xx/mpc8536_ds_defconfig     | 1802 --------------------
 arch/powerpc/configs/85xx/mpc8544_ds_defconfig     | 1802 --------------------
 arch/powerpc/configs/85xx/mpc8568mds_defconfig     | 1309 ---------------
 arch/powerpc/configs/mpc5200_defconfig             |  188 ++
 arch/powerpc/configs/mpc85xx_defconfig             |  252 +--
 arch/powerpc/configs/mpc85xx_smp_defconfig         |  343 ++--
 arch/powerpc/include/asm/elf.h                     |    3 
 arch/powerpc/kernel/prom_parse.c                   |   11 
 arch/powerpc/mm/hash_utils_64.c                    |    2 
 arch/powerpc/platforms/fsl_uli1575.c               |    5 
 arch/powerpc/platforms/pasemi/setup.c              |    4 
 arch/powerpc/platforms/ps3/os-area.c               |    2 
 arch/powerpc/sysdev/fsl_rio.c                      |   28 
 drivers/macintosh/Kconfig                          |    2 
 drivers/macintosh/mediabay.c                       |    2 
 include/linux/fsl_devices.h                        |    4 
 25 files changed, 896 insertions(+), 5441 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/mtd-physmap.txt
 delete mode 100644 arch/powerpc/configs/85xx/mpc8536_ds_defconfig
 delete mode 100644 arch/powerpc/configs/85xx/mpc8544_ds_defconfig
 delete mode 100644 arch/powerpc/configs/85xx/mpc8568mds_defconfig
 rename arch/powerpc/configs/{85xx/mpc8572_ds_defconfig => mpc85xx_smp_defconfig} (91%)

Alexander Beregalov (1):
      powerpc: Make macintosh/mediabay driver depend on CONFIG_BLOCK

Andreas Schwab (1):
      powerpc/32: Don't clobber personality flags on exec

Anton Vorontsov (2):
      powerpc/5200: Bring the legacy fsl_spi_platform_data hooks back
      fsl_rio: Pass the proper device to dma mapping routines

Bartlomiej Zolnierkiewicz (1):
      powerpc: Fix modular build of ide-pmac when mediabay is built in

Geoff Levand (3):
      powerpc/ps3: Fix CONFIG_PS3_FLASH=n build warning
      maintainers: Fix PS3 patterns
      powerpc/pasemi: Fix build error on UP

Grant Likely (2):
      powerpc/5200: Add FLASH nodes to lite5200 device tree
      powerpc/5200: defconfig updates

Ilpo Järvinen (1):
      powerpc: Fix of_node_put() exit path in of_irq_map_one()

Kumar Gala (4):
      powerpc/85xx: Updated generic mpc85xx_defconfig
      powerpc/85xx: Enabled a bunch of FSL specific drivers/options
      powerpc/85xx: Added SMP defconfig
      powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover

Michael Ellerman (1):
      powerpc: Fix crash on CPU hotplug

Stefan Roese (2):
      powerpc/of-device-tree: Factor MTD physmap bindings out of booting-without-of
      powerpc/device-tree: Document MTD nodes with multiple "reg" tuples

Timur Tabi (1):
      powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCD

[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 bug fixes, a documentation update and a
defconfig update for powerpc.

The commit from Hugh Dickins is not strictly a bugfix, but it is
small, obvious, only affects people using a very specialized embedded
setup (those using 256kB pages on PPC44x embedded systems), and I got
prodded by Andrew Morton about it, so I put it in.

Thanks,
Paul.

 Documentation/powerpc/dts-bindings/fsl/i2c.txt |   46 +++++--
 arch/powerpc/Kconfig                           |    2 
 arch/powerpc/boot/dts/tqm8540.dts              |    4 -
 arch/powerpc/boot/dts/tqm8541.dts              |    4 -
 arch/powerpc/boot/dts/tqm8548-bigflash.dts     |    8 +
 arch/powerpc/boot/dts/tqm8548.dts              |    8 +
 arch/powerpc/boot/dts/tqm8555.dts              |    4 -
 arch/powerpc/boot/dts/tqm8560.dts              |    4 -
 arch/powerpc/configs/85xx/tqm8548_defconfig    |  164 +++++++-----------------
 arch/powerpc/include/asm/futex.h               |   12 +-
 arch/powerpc/include/asm/mmu.h                 |    6 +
 arch/powerpc/include/asm/ppc-opcode.h          |   13 ++
 arch/powerpc/kernel/cputable.c                 |    2 
 arch/powerpc/mm/tlb_nohash.c                   |    1 
 arch/powerpc/mm/tlb_nohash_low.S               |   14 ++
 arch/powerpc/platforms/pseries/dtl.c           |    1 
 arch/powerpc/platforms/pseries/eeh_driver.c    |    2 
 include/linux/fsl_devices.h                    |    4 -
 18 files changed, 136 insertions(+), 163 deletions(-)

Hugh Dickins (1):
      powerpc: Allow 256kB pages with SHMEM

Kumar Gala (3):
      powerpc: Fix tlbilx opcode
      powerpc: Add support for early tlbilx opcode
      powerpc/mm: Fix compile warning

Mike Mason (1):
      powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset()

Paul Mackerras (1):
      powerpc: Fix data-corrupting bug in __futex_atomic_op

Sachin Sant (1):
      powerpc: pseries/dtl.c should include asm/firmware.h

Wolfgang Grandegger (4):
      powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes
      powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3
      powerpc/85xx: TQM8548: update defconfig
      powerpc: Document new FSL I2C bindings and cleanup

[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 powerpc update.  (I'm sending this instead of Ben
Herrenschmidt because Ben has just gone off on a month's vacation.)

Most of the commits are bug fixes and cleanups.  There is also a
commit from Stephen Rothwell to wire up preadv/pwritev and one from
Anton Blanchard that exports some statistics from the hypervisor on
pSeries machines.

Thanks,
Paul.

 arch/powerpc/Kconfig                    |    3 ++-
 arch/powerpc/boot/dts/ksi8560.dts       |    4 ++--
 arch/powerpc/boot/dts/pq2fads.dts       |   20 +++++++++++++-----
 arch/powerpc/boot/dts/sbc8548.dts       |    4 ++--
 arch/powerpc/boot/dts/sbc8560.dts       |    4 ++--
 arch/powerpc/boot/dts/socrates.dts      |    1 +
 arch/powerpc/boot/dts/stx_gp3_8560.dts  |    4 ++--
 arch/powerpc/boot/dts/tqm8540.dts       |    4 ++--
 arch/powerpc/boot/dts/tqm8541.dts       |    4 ++--
 arch/powerpc/boot/dts/tqm8555.dts       |    4 ++--
 arch/powerpc/boot/dts/tqm8560.dts       |    4 ++--
 arch/powerpc/configs/pseries_defconfig  |    2 +-
 arch/powerpc/include/asm/lppaca.h       |    2 +-
 arch/powerpc/include/asm/mpic.h         |   12 +++++++++++
 arch/powerpc/include/asm/ps3fb.h        |    1 -
 arch/powerpc/include/asm/pte-common.h   |    6 ++++-
 arch/powerpc/include/asm/reg.h          |   30 +++++++++++++++++++++++++++
 arch/powerpc/include/asm/reg_booke.h    |   30 ---------------------------
 arch/powerpc/include/asm/rtas.h         |    3 ++-
 arch/powerpc/include/asm/sfp-machine.h  |    6 +++--
 arch/powerpc/include/asm/systbl.h       |    3 +++
 arch/powerpc/include/asm/unistd.h       |    4 +++-
 arch/powerpc/kernel/fpu.S               |    5 +++++
 arch/powerpc/kernel/ftrace.c            |    4 ++--
 arch/powerpc/kernel/irq.c               |    4 +++-
 arch/powerpc/kernel/lparcfg.c           |   16 +++++++++++++++
 arch/powerpc/kernel/misc_64.S           |    8 +++++++
 arch/powerpc/kernel/prom_init.c         |   18 +++++++++-------
 arch/powerpc/kernel/ptrace32.c          |   15 ++++++++++----
 arch/powerpc/kernel/setup-common.c      |    1 -
 arch/powerpc/sysdev/mpic.c              |   34 +++++++++++++++++++++++++++++++
 drivers/serial/cpm_uart/cpm_uart_core.c |   14 ++++++-------
 drivers/serial/pmac_zilog.c             |   15 ++++++++++++++
 drivers/video/fsl-diu-fb.c              |   34 +++++++++++++++++++------------
 drivers/watchdog/wdrtas.c               |   13 ++++++++++--
 include/linux/fsl_devices.h             |   22 --------------------
 36 files changed, 235 insertions(+), 123 deletions(-)

Anton Blanchard (6):
      powerpc: Print progress of ibm,client-architecture method
      powerpc: Clean up some prom printouts
      powerpc/pseries: Add dispatch dispersion statistics
      powerpc/pseries: Scan for all events in rtasd
      powerpc/pseries: Fix ibm,client-architecture comment
      powerpc/pseries: Enable relay in pseries_defconfig

Anton Vorontsov (1):
      fsl-diu-fb: Pass the proper device for dma mapping routines

Benjamin Herrenschmidt (1):
      powerpc/pmac: Fix internal modem IRQ on Wallstreet PowerBook

Geert Uytterhoeven (1):
      powerpc: Correct dependency of KEXEC

Grant Likely (1):
      powerpc: Remove unused symbols from fsl_devices.h

Huang Weiyi (1):
      powerpc: Remove duplicated #include's

Josh Boyer (1):
      powerpc: Make LOWMEM_CAM_NUM depend on FSL_BOOKE

Kumar Gala (4):
      powerpc/85xx: Use fsl,mpc85.. as prefix for memory ctrl & l2-cache nodes
      powerpc: Move SPEFSCR defines to common header
      powerpc/math-emu: Change types to work on ppc64
      powerpc: Add support for CoreInt delivery of interrupts on MPIC

Mark Nelson (1):
      powerpc/wdrtas: Update wdrtas_get_interval to use rtas_data_buf

Michael Ellerman (3):
      powerpc: Print information about mapping hw irqs to virtual irqs
      powerpc/ftrace: Fix #if that should be #ifdef
      powerpc/ftrace: Fix printf format warning

Michael Neuling (2):
      powerpc: Disable VSX or current process in giveup_fpu/altivec
      powerpc: Fix ptrace compat wrapper for FPU register access

Paul Mackerras (1):
      powerpc: Fix oops when loading modules

Scott Wood (3):
      cpm_uart: Initialize port.dev before it's used.
      cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console.
      powerpc/pq2fads: Update device tree for use with device-tree-aware u-boot.

Stephen Rothwell (1):
      powerpc: Wire up preadv and pwritev

Wolfgang Grandegger (1):
      powerpc/85xx: Re-add the device_type soc to socrates.dts

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

So here's is the powerpc main batch for this merge window. 

You'll notice some x86 and ftrace changes in there, they come from a
commit I pulled from Steven Rostedt that was a pre-req for some other
powerpc work in that area. The commit was pulled from a tree that Ingo
should have pulled too, at least that's how we decided to do things
back then, so there should be no problem.

Cheers,
Ben.

The following changes since commit 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b:
  Linus Torvalds (1):
        Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/.../x86/linux-2.6-tip

are available in the git repository at:

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

Andrew Klossner (1):
      powerpc/udbg: Fix lost byte during console handover; change LFCR to CRLF

Anton Blanchard (11):
      powerpc/mm: Move 64-bit unmapped_area to top of address space
      powerpc/mm: Reduce hashtable size when using 64kB pages
      powerpc: Move is_32bit_task
      powerpc: Rearrange mmap.c
      powerpc: Randomise mmap start address
      powerpc: More stack randomisation for 64bit binaries
      powerpc: Randomise lower bits of stack address
      powerpc: Randomise the brk region
      powerpc: Ensure random space between stack and mmaps
      powerpc: Increase stack gap on 64bit binaries
      powerpc: Randomise PIEs

Anton Vorontsov (10):
      powerpc/fsl_pci: Add MPC83xx PCI-E controller RC mode support
      powerpc/83xx: Add PCI-E support for all MPC83xx boards with PCI-E
      powerpc: Document FSL eSDHC bindings
      powerpc/83xx: Convert existing sdhc nodes to new bindings
      powerpc/83xx: Add FSL eSDHC support for MPC837x-RDB boards
      powerpc/83xx: Do not configure or probe disabled FSL DR USB controllers
      powerpc/83xx: Add power management support for MPC837x boards
      powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes
      powerpc/85xx: Move gianfar mdio nodes under the ethernet nodes
      powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes

Arnd Bergmann (2):
      powerpc/cell: Fix dependency in cpufreq
      powerpc/spufs: Initialize ctx->stats.tstamp correctly

Benjamin Herrenschmidt (29):
      Merge commit 'kumar/next' into next
      Merge commit 'gcl/next' into next
      powerpc/mm: Rework I$/D$ coherency (v3)
      powerpc/4xx: Add missing USB and i2c devices to Canyonlands
      powerpc/4xx: Enable PCI domains on 4xx
      Merge commit 'origin/master' into next
      Merge commit 'kumar/next' into next
      Merge commit 'ftrace/function-graph' into next
      Merge commit 'jwb/next' into next
      Merge commit 'gcl/next' into next
      Merge commit 'origin/master' into next
      powerpc: Wire up /proc/vmallocinfo to our ioremap()
      powerpc/mm: Properly wire up get_user_pages_fast() on 32-bit
      powerpc/kconfig: Kill PPC_MULTIPLATFORM
      powerpc/mm: Split the various pgtable-* headers based on MMU type
      powerpc/mm: Unify PTE_RPN_SHIFT and _PAGE_CHG_MASK definitions
      Merge commit 'kumar/next' into next
      Merge commit 'gcl/next' into next
      Merge commit 'origin/master' into next
      powerpc: Fix prom_init on 32-bit OF machines
      powerpc/mm: Tweak PTE bit combination definitions
      powerpc/mm: Merge various PTE bits and accessors definitions
      powerpc/mm: Rename arch/powerpc/kernel/mmap.c to mmap_64.c
      powerpc/mm: Fix printk type warning in mmu_context_nohash
      powerpc/mm: Add option for non-atomic PTE updates to ppc64
      powerpc/mm: Introduce early_init_mmu() on 64-bit
      powerpc: Fix bugs introduced by sysfs changes
      Merge commit 'kumar/next' into next
      Merge commit 'origin/master' into next

Benjamin Krill (1):
      powerpc/cell: Add rtas rtc calls for the QPACE platform

Brian King (1):
      powerpc/pseries: Fix partition migration hang under load

Gabriel Paubert (1):
      powerpc: Disable mv643xx Ethernet port 0 on Pegasos

Geoff Levand (2):
      powerpc: Add missing DABR flags
      powerpc/ps3: Print memory hotplug errors

Gerhard Pircher (4):
      powerpc/amigaone: Add platform support for AmigaOne
      powerpc/amigaone: Generic device tree for all AmigaOne boards
      powerpc/amigaone: Bootwrapper and serial console support for AmigaOne
      powerpc/amigaone: Default config for AmigaOne boards

Giuliano Pochini (1):
      powerpc/powermac: Hotplug /sys entries are missing

Grant Likely (12):
      powerpc/5200: Stop using device_type and port-number properties
      powerpc/5200: Trim cruft from device trees
      powerpc/5200: Don't specify IRQF_SHARED in PSC UART driver
      powerpc/5200: Remove pr_debug() from hot paths in irq driver
      powerpc/5200: Refactor mpc5200 interrupt controller driver
      powerpc/5200: Rework GPT driver to also be an IRQ controller
      powerpc/5200: Add support for the Media5200 board from Freescale
      powerpc/5200: Add 'simple-bus' to the of_platform probe list.
      powerpc/4xx: update ml507 .dts file to release reference design
      powerpc/5200: remove sysfs debug file from GPT driver
      powerpc/bootwrapper: add fixed-head.o to simpleimage wrappers
      powerpc/cpm2: fix building fs_enet driver as a module.

Grzegorz Bernacki (3):
      powerpc/5200: Add support for the digsy MTC board.
      powerpc/5200: Add digsy-mtc support to mpc5200_defconfig
      powerpc/5200: On the digsy-mtc, configure PSC4 and PSC5 as UARTs

Ilya Yanok (1):
      powerpc: Rework dma-noncoherent to use generic vmalloc layer

Jeremy Kerr (10):
      powerpc/spufs: Use correct return value for spu_handle_mm_fault
      powerpc/spufs: Clear purge status before setting up isolated mode
      powerpc/spufs: Constify context contents and coredump callback constants
      powerpc/spufs: Check file offset before calculating write size in fixed-sized files
      powerpc/spufs: Fix incorrect buffer offset in regs write
      powerpc: Fix page_ins details in lppaca comments
      powerpc: Add dispatch trace log fields to lppaca
      powerpc: Add virtual processor dispatch trace log
      powerpc/cell: Fix iommu exception reporting
      powerpc: Add write barrier before enabling DTL flags

John Linn (1):
      powerpc/virtex/spi: Xilinx SPI driver not releasing memory

Josh Boyer (1):
      powerpc: Sanitize stack pointer in signal handling code

Kumar Gala (19):
      powerpc/fsl-booke: Cleanup init/exception setup to be runtime
      powerpc/fsl: Ensure PCI_QUIRKS are enabled for FSL_PCI
      powerpc/85xx: Fixed PCI IO region sizes in mpc8572ds*.dts
      powerpc/85xx: Added 36-bit physical device tree for mpc8572ds board
      powerpc/fsl-booke: Add new ISA 2.06 page sizes and MAS defines
      powerpc/book-3e: Introduce concept of Book-3e MMU
      powerpc/fsl-booke: Fix compile warning
      powerpc: Unify opcode definitions and support
      powerpc: Fix warnings from make headers_check
      powerpc: Add support for using doorbells for SMP IPI
      powerpc/fsl-booke: Add support for tlbilx instructions
      powerpc/85xx: Update smp support to handle doorbells and non-mpic init
      powerpc/pci: Default to dma_direct_ops for pci dma_ops
      powerpc: setup default archdata for {of_}platform via bus_register_notifier
      powerpc: expect all devices calling dma ops to have archdata set
      powerpc/mm: Remove unused register usage in SW TLB miss handling
      powerpc/mm: Used free register to save a few cycles in SW TLB miss handling
      powerpc/mm: e300c2/c3/c4 TLB errata workaround
      powerpc/83xx: Update ranges in gianfar node to match other dts

Laurent Pinchart (1):
      cpm2: Round the baud-rate clock divider to the nearest integer.

Liu Yu (1):
      powerpc/math-emu: Fix efp dependence

Madhulika Madishetty (1):
      AMCC PPC 460SX redwood SoC platform initial framework

Martyn Welch (7):
      powerpc/86xx: Board support for GE Fanuc SBC310
      powerpc/86xx: Default configutation for GE Fanuc's SBC310
      powerpc/86xx: Extend GE Fanuc GPIO driver for the SBC310
      powerpc/86xx: Correct local bus registers in GE Fanuc SBC610 dts file
      powerpc/86xx: Run sbc310 USB fixup code only on the appropriate platform.
      powerpc/86xx: Board support for GE Fanuc's PPC9A
      powerpc/86xx: Default configuration for GE Fanuc's PPC9A

Michael Ellerman (20):
      powerpc: Remove unused ppc64_terminate_msg()
      powerpc: Allow debugging of LMBs with lmb=debug
      lmb: Rework lmb_dump_all() output
      powerpc/pseries: Fix MSI-X interrupt querying
      powerpc/pseries: Add support for ibm,req#msi-x
      powerpc/pseries: Check for MSI-X also in rtas_msi_pci_irq_fixup()
      powerpc/pseries: Return the number of MSIs we could allocate
      powerpc/pseries: Return req#msi(-x) if request is larger
      powerpc/pseries: Implement a quota system for MSIs
      powerpc: Deindentify identify_cpu()
      powerpc: Make sure we copy all cpu_spec features except PMC related ones
      powerpc: Remove unused asm-offsets entries for cpu_spec
      powerpc: Print linux_banner in prom_init
      powerpc/pseries: Reject discontiguous/non-zero based MSI-X requests
      powerpc/pseries: The pseries MSI code depends on EEH
      powerpc/cell: Fix Axon MSI driver dependencies
      powerpc/pseries: The RPA PCI hotplug driver depends on EEH
      powerpc/cell: Make axonram depends on BLOCK
      powerpc/msi: Mark the MSI bitmap selftest code as __init
      powerpc: Turn on self-tests in ppc64_defconfig

Michael Neuling (2):
      powerpc: Add alignment handler for new lfiwzx instruction
      powerpc: Fix load/store float double alignment handler

Mike Mason (1):
      powerpc/eeh: Only disable/enable LSI interrupts in EEH

Milton Miller (4):
      powerpc/numa: Avoid possible reference beyond prop. length in find_min_common_depth()
      powerpc/numa: Remove redundant find_cpu_node()
      powerpc/pseries: Remove write only variable in PCI DLPAR
      powerpc/pci: Move hose_list and pci_address_to_pio to pci-common

Nathan Fontenot (2):
      powerpc/numa: Cleanup hot_add_scn_to_nid
      powerpc/pseries: Failed reconfig notifier chain call cleanup

Nick Piggin (1):
      powerpc: Estimate G5 cpufreq transition latency

Octavian Purdila (2):
      powerpc/oprofile: G4 oprofile has variable number of counters
      powerpc/oprofile: Enable support for ppc750 processors

Peter Korsgaard (1):
      powerpc: convert dts-bindings/fsl/dma.txt to dts-v1 syntax

Reynes Philippe (3):
      powerpc/83xx: Add i2c eeprom to dts for MPC837x RDB
      powerpc/83xx: Add gpio to MPC837x RDB
      powerpc/83xx: Add lm75 to MPC837x RDB dts

Rusty Russell (2):
      powerpc: Make sysfs code use smp_call_function_single
      cpumask: Use mm_cpumask() wrapper instead of cpu_vm_mask

Stephen Rothwell (1):
      powerpc/pmi: Irq handlers return irqreturn_t

Steven Rostedt (11):
      tracing/function-graph-tracer: make arch generic push pop functions
      ftrace, powerpc: replace debug macro with proper pr_deug
      powerpc, ftrace: fix compile error when modules not configured
      powerpc64: port of the function graph tracer
      powerpc64, tracing: add function graph tracer with dynamic tracing
      powerpc64, ftrace: save toc only on modules for function graph
      powerpc32, ftrace: save and restore mcount regs with macro
      powerpc32, ftrace: port function graph tracer to ppc32, static only
      powerpc32, ftrace: dynamic function graph tracer
      powerpc, ftrace: use unsigned int for instruction manipulation
      powerpc, ftrace: use create_branch lib function

Ted Peters (1):
      powerpc/85xx: Fix MPC8572DS PCI protected interrupt sources

Thomas Gleixner (3):
      powerpc/irq: Convert obsolete irq_desc_t to struct irq_desc
      powerpc/irq: Convert obsolete hw_interrupt_type to struct irq_chip
      powerpc/85xx: remove setup_irq(NULL action) in ksi8560

Timur Tabi (4):
      i2c-mpc: do not allow interruptions when waiting for I2C to complete
      powerpc: add fsl,fifo-depth property to Freescale SSI device nodes
      powerpc: Add defintion for MSR[GS] to list of MSR bits
      powerpc: clean up ssi.txt, add definition for fsl,ssi-asynchronous

Tom Arbuckle (1):
      powerpc/pci: Fix PCI<->OF matching of old style multifunc devices

Trent Piepho (3):
      powerpc/fsl-booke: Remove code duplication in lowmem mapping
      powerpc/fsl-booke: Allow larger CAM sizes than 256 MB
      powerpc/fsl-booke: Make CAM entries used for lowmem configurable

Wolfgang Grandegger (4):
      powerpc/85xx: TQM85xx - fix sensitivity of CAN interrupts
      powerpc/85xx: TQM85xx - add i2c device nodes for LM75
      powerpc/5200: add function to return external clock frequency
      powerpc/85xx: Add support for the "socrates" board (MPC8544).

Wolfram Sang (2):
      powerpc/pci: Fix typo: s/resouces/resources/ in a pr_debug
      powerpc/5200: add Phytec phyCORE-MPC5200B-IO board (pcm032)

Xiaotian Feng (1):
      cpm_uart: fix non-console port startup bug

Yuri Tikhonov (1):
      powerpc/44x: Support for 256KB PAGE_SIZE

dayu@datangmobile.cn (1):
      powerpc/83xx: Fix the interrupt loss problem on ipic

roel kluin (2):
      therm_adt746x: Fix signed/unsigned confusion
      powerpc/ps3: Make ps3av_set_video_mode mode ID signed

 Documentation/powerpc/dts-bindings/fsl/dma.txt     |   34 +-
 Documentation/powerpc/dts-bindings/fsl/esdhc.txt   |   24 +
 Documentation/powerpc/dts-bindings/fsl/ssi.txt     |   68 +-
 arch/powerpc/Kconfig                               |   74 +-
 arch/powerpc/Kconfig.debug                         |    2 +-
 arch/powerpc/Makefile                              |    4 +-
 arch/powerpc/boot/Makefile                         |    9 +-
 arch/powerpc/boot/cuboot-amigaone.c                |   35 +
 arch/powerpc/boot/dts/amigaone.dts                 |  173 ++
 arch/powerpc/boot/dts/asp834x-redboot.dts          |   82 +-
 arch/powerpc/boot/dts/canyonlands.dts              |   28 +
 arch/powerpc/boot/dts/cm5200.dts                   |   49 +-
 arch/powerpc/boot/dts/digsy_mtc.dts                |  254 +++
 arch/powerpc/boot/dts/gef_ppc9a.dts                |  367 ++++
 arch/powerpc/boot/dts/gef_sbc310.dts               |  367 ++++
 arch/powerpc/boot/dts/gef_sbc610.dts               |   41 +-
 arch/powerpc/boot/dts/ksi8560.dts                  |   79 +-
 arch/powerpc/boot/dts/lite5200.dts                 |   52 +-
 arch/powerpc/boot/dts/lite5200b.dts                |   63 +-
 arch/powerpc/boot/dts/media5200.dts                |  318 ++++
 arch/powerpc/boot/dts/motionpro.dts                |   42 +-
 arch/powerpc/boot/dts/mpc8313erdb.dts              |   11 +-
 arch/powerpc/boot/dts/mpc8315erdb.dts              |  144 ++-
 arch/powerpc/boot/dts/mpc8349emitx.dts             |   69 +-
 arch/powerpc/boot/dts/mpc8349emitxgp.dts           |   42 +-
 arch/powerpc/boot/dts/mpc834x_mds.dts              |   81 +-
 arch/powerpc/boot/dts/mpc8377_mds.dts              |  211 ++-
 arch/powerpc/boot/dts/mpc8377_rdb.dts              |  229 ++-
 arch/powerpc/boot/dts/mpc8378_mds.dts              |  209 ++-
 arch/powerpc/boot/dts/mpc8378_rdb.dts              |  229 ++-
 arch/powerpc/boot/dts/mpc8379_mds.dts              |  146 +-
 arch/powerpc/boot/dts/mpc8379_rdb.dts              |  164 ++-
 arch/powerpc/boot/dts/mpc8536ds.dts                |   78 +-
 arch/powerpc/boot/dts/mpc8540ads.dts               |  117 +-
 arch/powerpc/boot/dts/mpc8541cds.dts               |   78 +-
 arch/powerpc/boot/dts/mpc8544ds.dts                |   81 +-
 arch/powerpc/boot/dts/mpc8548cds.dts               |  156 +-
 arch/powerpc/boot/dts/mpc8555cds.dts               |   78 +-
 arch/powerpc/boot/dts/mpc8560ads.dts               |  102 +-
 arch/powerpc/boot/dts/mpc8568mds.dts               |  102 +-
 arch/powerpc/boot/dts/mpc8572ds.dts                |  160 +-
 arch/powerpc/boot/dts/mpc8572ds_36b.dts            |  799 +++++++++
 arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts     |   49 +-
 arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts     |    6 +-
 arch/powerpc/boot/dts/mpc8610_hpcd.dts             |    2 +
 arch/powerpc/boot/dts/mpc8641_hpcn.dts             |  157 +-
 arch/powerpc/boot/dts/pcm030.dts                   |  182 +--
 arch/powerpc/boot/dts/pcm032.dts                   |  392 ++++
 arch/powerpc/boot/dts/redwood.dts                  |  244 +++
 arch/powerpc/boot/dts/sbc8349.dts                  |   80 +-
 arch/powerpc/boot/dts/sbc8548.dts                  |   78 +-
 arch/powerpc/boot/dts/sbc8560.dts                  |  100 +-
 arch/powerpc/boot/dts/sbc8641d.dts                 |  156 +-
 arch/powerpc/boot/dts/socrates.dts                 |  338 ++++
 arch/powerpc/boot/dts/stx_gp3_8560.dts             |   78 +-
 arch/powerpc/boot/dts/tqm5200.dts                  |   32 +-
 arch/powerpc/boot/dts/tqm8540.dts                  |  122 +-
 arch/powerpc/boot/dts/tqm8541.dts                  |   95 +-
 arch/powerpc/boot/dts/tqm8548-bigflash.dts         |  177 +-
 arch/powerpc/boot/dts/tqm8548.dts                  |  177 +-
 arch/powerpc/boot/dts/tqm8555.dts                  |   95 +-
 arch/powerpc/boot/dts/tqm8560.dts                  |   99 +-
 arch/powerpc/boot/dts/virtex440-ml507.dts          |  124 ++-
 arch/powerpc/boot/serial.c                         |    3 +-
 arch/powerpc/boot/wrapper                          |    7 +-
 arch/powerpc/configs/44x/canyonlands_defconfig     |  266 +++-
 arch/powerpc/configs/44x/redwood_defconfig         | 1176 ++++++++++++
 arch/powerpc/configs/85xx/socrates_defconfig       | 1410 +++++++++++++++
 arch/powerpc/configs/86xx/gef_ppc9a_defconfig      | 1889 ++++++++++++++++++++
 arch/powerpc/configs/86xx/gef_sbc310_defconfig     | 1613 +++++++++++++++++
 arch/powerpc/configs/amigaone_defconfig            | 1636 +++++++++++++++++
 arch/powerpc/configs/mpc5200_defconfig             |   71 +-
 arch/powerpc/configs/ppc64_defconfig               |    6 +-
 arch/powerpc/include/asm/code-patching.h           |    4 +-
 arch/powerpc/include/asm/cputable.h                |    4 +-
 arch/powerpc/include/asm/dbell.h                   |   43 +
 arch/powerpc/include/asm/dma-mapping.h             |   12 +-
 arch/powerpc/include/asm/elf.h                     |   12 +-
 arch/powerpc/include/asm/fixmap.h                  |    2 +-
 arch/powerpc/include/asm/ftrace.h                  |   39 +-
 arch/powerpc/include/asm/highmem.h                 |   12 +-
 arch/powerpc/include/asm/hw_irq.h                  |    2 +-
 arch/powerpc/include/asm/io.h                      |    6 +
 arch/powerpc/include/asm/lppaca.h                  |    8 +-
 arch/powerpc/include/asm/machdep.h                 |    4 +-
 arch/powerpc/include/asm/mmu-44x.h                 |    2 +
 .../include/asm/{mmu-fsl-booke.h => mmu-book3e.h}  |   66 +-
 arch/powerpc/include/asm/mmu-hash64.h              |    2 -
 arch/powerpc/include/asm/mmu.h                     |   20 +-
 arch/powerpc/include/asm/mmu_context.h             |    2 +-
 arch/powerpc/include/asm/mpc52xx.h                 |    1 +
 arch/powerpc/include/asm/page.h                    |    6 +-
 arch/powerpc/include/asm/page_32.h                 |    4 +
 arch/powerpc/include/asm/pgtable-4k.h              |  117 --
 arch/powerpc/include/asm/pgtable-ppc32.h           |  557 +------
 arch/powerpc/include/asm/pgtable-ppc64-4k.h        |   74 +
 arch/powerpc/include/asm/pgtable-ppc64-64k.h       |   42 +
 arch/powerpc/include/asm/pgtable-ppc64.h           |  196 +--
 arch/powerpc/include/asm/pgtable.h                 |  134 ++
 arch/powerpc/include/asm/ppc-opcode.h              |   73 +
 arch/powerpc/include/asm/ppc_asm.h                 |    6 +-
 arch/powerpc/include/asm/processor.h               |   19 +
 arch/powerpc/include/asm/ps3av.h                   |    2 +-
 arch/powerpc/include/asm/ps3fb.h                   |    1 +
 arch/powerpc/include/asm/pte-40x.h                 |   64 +
 arch/powerpc/include/asm/pte-44x.h                 |  102 ++
 arch/powerpc/include/asm/pte-8xx.h                 |   67 +
 arch/powerpc/include/asm/pte-common.h              |  180 ++
 arch/powerpc/include/asm/pte-fsl-booke.h           |   48 +
 arch/powerpc/include/asm/pte-hash32.h              |   48 +
 arch/powerpc/include/asm/pte-hash64-4k.h           |   17 +
 .../asm/{pgtable-64k.h => pte-hash64-64k.h}        |  132 +-
 arch/powerpc/include/asm/pte-hash64.h              |   54 +
 arch/powerpc/include/asm/reg.h                     |    2 +
 arch/powerpc/include/asm/reg_booke.h               |    2 +
 arch/powerpc/include/asm/system.h                  |    2 +-
 arch/powerpc/include/asm/thread_info.h             |   11 +-
 arch/powerpc/include/asm/udbg.h                    |    1 +
 arch/powerpc/kernel/Makefile                       |   12 +-
 arch/powerpc/kernel/align.c                        |    2 +-
 arch/powerpc/kernel/asm-offsets.c                  |    3 -
 arch/powerpc/kernel/cpu_setup_44x.S                |    1 +
 arch/powerpc/kernel/cpu_setup_6xx.S                |    5 +
 arch/powerpc/kernel/cpu_setup_fsl_booke.S          |   31 +
 arch/powerpc/kernel/cputable.c                     |  166 ++-
 arch/powerpc/kernel/crash_dump.c                   |    2 +-
 arch/powerpc/kernel/dbell.c                        |   44 +
 arch/powerpc/kernel/entry_32.S                     |  129 +-
 arch/powerpc/kernel/entry_64.S                     |   89 +-
 arch/powerpc/kernel/ftrace.c                       |  222 ++-
 arch/powerpc/kernel/head_32.S                      |  101 +-
 arch/powerpc/kernel/head_64.S                      |    6 +-
 arch/powerpc/kernel/head_booke.h                   |   19 +-
 arch/powerpc/kernel/head_fsl_booke.S               |  101 +-
 arch/powerpc/kernel/irq.c                          |    4 +-
 arch/powerpc/kernel/module_64.c                    |    2 +-
 arch/powerpc/kernel/pci-common.c                   |   45 +-
 arch/powerpc/kernel/pci_32.c                       |   36 +-
 arch/powerpc/kernel/pci_64.c                       |   19 -
 arch/powerpc/kernel/process.c                      |   58 +
 arch/powerpc/kernel/prom.c                         |    6 +-
 arch/powerpc/kernel/prom_init.c                    |    2 +
 arch/powerpc/kernel/prom_init_check.sh             |    2 +-
 arch/powerpc/kernel/rtas.c                         |   10 +-
 arch/powerpc/kernel/setup-common.c                 |   36 +
 arch/powerpc/kernel/setup_64.c                     |   42 +-
 arch/powerpc/kernel/signal.c                       |    4 +-
 arch/powerpc/kernel/signal.h                       |   12 +-
 arch/powerpc/kernel/signal_32.c                    |    4 +-
 arch/powerpc/kernel/signal_64.c                    |    2 +-
 arch/powerpc/kernel/sysfs.c                        |   35 +-
 arch/powerpc/kernel/traps.c                        |   79 +-
 arch/powerpc/kernel/udbg.c                         |    7 +
 arch/powerpc/kernel/udbg_16550.c                   |   60 +-
 arch/powerpc/kernel/vmlinux.lds.S                  |    1 +
 arch/powerpc/lib/dma-noncoherent.c                 |  303 +---
 arch/powerpc/lib/feature-fixups.c                  |    4 +-
 arch/powerpc/math-emu/Makefile                     |    5 +-
 arch/powerpc/mm/Makefile                           |    4 +-
 arch/powerpc/mm/fault.c                            |   46 +-
 arch/powerpc/mm/fsl_booke_mmu.c                    |   95 +-
 arch/powerpc/mm/gup.c                              |   16 +-
 arch/powerpc/mm/hash_utils_64.c                    |   51 +-
 arch/powerpc/mm/mem.c                              |   33 -
 arch/powerpc/mm/{mmap.c => mmap_64.c}              |   64 +-
 arch/powerpc/mm/mmu_context_nohash.c               |    4 +-
 arch/powerpc/mm/numa.c                             |  174 +-
 arch/powerpc/mm/pgtable.c                          |  134 ++-
 arch/powerpc/mm/pgtable_32.c                       |   18 +-
 arch/powerpc/mm/pgtable_64.c                       |   25 +-
 arch/powerpc/mm/ppc_mmu_32.c                       |   10 +-
 arch/powerpc/mm/tlb_hash64.c                       |    6 +-
 arch/powerpc/mm/tlb_nohash.c                       |   18 +-
 arch/powerpc/mm/tlb_nohash_low.S                   |   44 +-
 arch/powerpc/oprofile/op_model_7450.c              |   21 +-
 arch/powerpc/platforms/44x/Kconfig                 |   19 +
 arch/powerpc/platforms/44x/ppc44x_simple.c         |    1 +
 arch/powerpc/platforms/512x/Kconfig                |    4 +-
 arch/powerpc/platforms/52xx/Kconfig                |   15 +-
 arch/powerpc/platforms/52xx/Makefile               |    3 +-
 arch/powerpc/platforms/52xx/media5200.c            |  273 +++
 arch/powerpc/platforms/52xx/mpc5200_simple.c       |    4 +-
 arch/powerpc/platforms/52xx/mpc52xx_common.c       |   40 +-
 arch/powerpc/platforms/52xx/mpc52xx_gpio.c         |   85 -
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |  396 ++++
 arch/powerpc/platforms/52xx/mpc52xx_pic.c          |  170 +--
 arch/powerpc/platforms/82xx/Kconfig                |    2 +-
 arch/powerpc/platforms/83xx/Kconfig                |    2 +-
 arch/powerpc/platforms/83xx/asp834x.c              |    1 +
 arch/powerpc/platforms/83xx/mpc831x_rdb.c          |    2 +
 arch/powerpc/platforms/83xx/mpc834x_itx.c          |    1 +
 arch/powerpc/platforms/83xx/mpc834x_mds.c          |    1 +
 arch/powerpc/platforms/83xx/mpc837x_mds.c          |   11 +-
 arch/powerpc/platforms/83xx/mpc837x_rdb.c          |    3 +
 arch/powerpc/platforms/83xx/sbc834x.c              |    1 +
 arch/powerpc/platforms/83xx/usb.c                  |    3 +-
 arch/powerpc/platforms/85xx/Kconfig                |    6 +
 arch/powerpc/platforms/85xx/Makefile               |    1 +
 arch/powerpc/platforms/85xx/ksi8560.c              |    3 +-
 arch/powerpc/platforms/85xx/mpc8536_ds.c           |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_ads.c          |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_cds.c          |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_ds.c           |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 +
 arch/powerpc/platforms/85xx/sbc8548.c              |    1 +
 arch/powerpc/platforms/85xx/sbc8560.c              |    1 +
 arch/powerpc/platforms/85xx/smp.c                  |   43 +-
 arch/powerpc/platforms/85xx/socrates.c             |  133 ++
 arch/powerpc/platforms/85xx/socrates_fpga_pic.c    |  327 ++++
 arch/powerpc/platforms/85xx/socrates_fpga_pic.h    |   16 +
 arch/powerpc/platforms/85xx/stx_gp3.c              |    1 +
 arch/powerpc/platforms/85xx/tqm85xx.c              |    1 +
 arch/powerpc/platforms/86xx/Kconfig                |   20 +-
 arch/powerpc/platforms/86xx/Makefile               |    2 +
 arch/powerpc/platforms/86xx/gef_gpio.c             |   36 +-
 arch/powerpc/platforms/86xx/gef_ppc9a.c            |  224 +++
 arch/powerpc/platforms/86xx/gef_sbc310.c           |  235 +++
 arch/powerpc/platforms/86xx/gef_sbc610.c           |    1 +
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c         |    1 +
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c         |    1 +
 arch/powerpc/platforms/86xx/sbc8641d.c             |    1 +
 arch/powerpc/platforms/Kconfig                     |   39 +-
 arch/powerpc/platforms/Kconfig.cputype             |   22 +-
 arch/powerpc/platforms/Makefile                    |    1 +
 arch/powerpc/platforms/amigaone/Kconfig            |   18 +
 arch/powerpc/platforms/amigaone/Makefile           |    1 +
 arch/powerpc/platforms/amigaone/setup.c            |  170 ++
 arch/powerpc/platforms/cell/Kconfig                |   33 +-
 arch/powerpc/platforms/cell/Makefile               |    2 +-
 arch/powerpc/platforms/cell/io-workarounds.c       |    4 +-
 arch/powerpc/platforms/cell/iommu.c                |    9 +-
 arch/powerpc/platforms/cell/qpace_setup.c          |   15 +-
 arch/powerpc/platforms/cell/spu_base.c             |    2 +-
 arch/powerpc/platforms/cell/spu_fault.c            |   48 +-
 arch/powerpc/platforms/cell/spufs/context.c        |    4 +
 arch/powerpc/platforms/cell/spufs/file.c           |   20 +-
 arch/powerpc/platforms/cell/spufs/inode.c          |    5 +-
 arch/powerpc/platforms/cell/spufs/run.c            |    3 +
 arch/powerpc/platforms/cell/spufs/spufs.h          |    8 +-
 arch/powerpc/platforms/chrp/Kconfig                |    2 +-
 arch/powerpc/platforms/chrp/pegasos_eth.c          |   72 +-
 arch/powerpc/platforms/embedded6xx/Kconfig         |    2 +-
 arch/powerpc/platforms/iseries/Kconfig             |    2 +-
 arch/powerpc/platforms/iseries/irq.c               |    2 +-
 arch/powerpc/platforms/iseries/setup.c             |    2 +-
 arch/powerpc/platforms/maple/Kconfig               |    2 +-
 arch/powerpc/platforms/pasemi/Kconfig              |    2 +-
 arch/powerpc/platforms/powermac/Kconfig            |    2 +-
 arch/powerpc/platforms/powermac/cpufreq_64.c       |    5 +-
 arch/powerpc/platforms/powermac/pic.h              |    2 +-
 arch/powerpc/platforms/powermac/setup.c            |    3 +
 arch/powerpc/platforms/prep/Kconfig                |    2 +-
 arch/powerpc/platforms/ps3/Kconfig                 |    2 +-
 arch/powerpc/platforms/ps3/mm.c                    |    4 +-
 arch/powerpc/platforms/pseries/Kconfig             |   17 +-
 arch/powerpc/platforms/pseries/Makefile            |    3 +-
 arch/powerpc/platforms/pseries/dtl.c               |  278 +++
 arch/powerpc/platforms/pseries/eeh_driver.c        |   68 +-
 arch/powerpc/platforms/pseries/msi.c               |  248 +++-
 arch/powerpc/platforms/pseries/pci_dlpar.c         |    2 -
 arch/powerpc/platforms/pseries/plpar_wrappers.h    |   10 +
 arch/powerpc/platforms/pseries/reconfig.c          |    6 +-
 arch/powerpc/sysdev/cpm2.c                         |    4 +-
 arch/powerpc/sysdev/cpm_common.c                   |    2 +-
 arch/powerpc/sysdev/fsl_pci.c                      |  244 +++-
 arch/powerpc/sysdev/fsl_soc.c                      |    4 +
 arch/powerpc/sysdev/ipic.c                         |    6 +-
 arch/powerpc/sysdev/msi_bitmap.c                   |    6 +-
 arch/powerpc/sysdev/pmi.c                          |    2 +-
 arch/powerpc/sysdev/ppc4xx_pci.c                   |    2 +
 arch/x86/include/asm/ftrace.h                      |   25 -
 arch/x86/kernel/dumpstack.c                        |    1 +
 arch/x86/kernel/ftrace.c                           |   75 +-
 drivers/i2c/busses/i2c-mpc.c                       |    9 +-
 drivers/macintosh/therm_adt746x.c                  |    4 +-
 drivers/net/fec_mpc52xx.c                          |    6 +-
 drivers/ps3/ps3av.c                                |   16 +-
 drivers/serial/cpm_uart/cpm_uart_core.c            |   14 +-
 drivers/serial/mpc52xx_uart.c                      |   40 +-
 drivers/spi/xilinx_spi.c                           |    9 +-
 drivers/watchdog/Kconfig                           |    2 +-
 include/linux/ftrace.h                             |   24 +
 include/linux/pci_ids.h                            |    8 +
 kernel/trace/trace_functions_graph.c               |   75 +
 lib/lmb.c                                          |   42 +-
 285 files changed, 20157 insertions(+), 4688 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/fsl/esdhc.txt
 create mode 100644 arch/powerpc/boot/cuboot-amigaone.c
 create mode 100644 arch/powerpc/boot/dts/amigaone.dts
 create mode 100644 arch/powerpc/boot/dts/digsy_mtc.dts
 create mode 100644 arch/powerpc/boot/dts/gef_ppc9a.dts
 create mode 100644 arch/powerpc/boot/dts/gef_sbc310.dts
 create mode 100644 arch/powerpc/boot/dts/media5200.dts
 create mode 100644 arch/powerpc/boot/dts/mpc8572ds_36b.dts
 create mode 100644 arch/powerpc/boot/dts/pcm032.dts
 create mode 100644 arch/powerpc/boot/dts/redwood.dts
 create mode 100644 arch/powerpc/boot/dts/socrates.dts
 create mode 100644 arch/powerpc/configs/44x/redwood_defconfig
 create mode 100644 arch/powerpc/configs/85xx/socrates_defconfig
 create mode 100644 arch/powerpc/configs/86xx/gef_ppc9a_defconfig
 create mode 100644 arch/powerpc/configs/86xx/gef_sbc310_defconfig
 create mode 100644 arch/powerpc/configs/amigaone_defconfig
 create mode 100644 arch/powerpc/include/asm/dbell.h
 rename arch/powerpc/include/asm/{mmu-fsl-booke.h => mmu-book3e.h} (53%)
 delete mode 100644 arch/powerpc/include/asm/pgtable-4k.h
 create mode 100644 arch/powerpc/include/asm/pgtable-ppc64-4k.h
 create mode 100644 arch/powerpc/include/asm/pgtable-ppc64-64k.h
 create mode 100644 arch/powerpc/include/asm/ppc-opcode.h
 create mode 100644 arch/powerpc/include/asm/pte-40x.h
 create mode 100644 arch/powerpc/include/asm/pte-44x.h
 create mode 100644 arch/powerpc/include/asm/pte-8xx.h
 create mode 100644 arch/powerpc/include/asm/pte-common.h
 create mode 100644 arch/powerpc/include/asm/pte-fsl-booke.h
 create mode 100644 arch/powerpc/include/asm/pte-hash32.h
 create mode 100644 arch/powerpc/include/asm/pte-hash64-4k.h
 rename arch/powerpc/include/asm/{pgtable-64k.h => pte-hash64-64k.h} (73%)
 create mode 100644 arch/powerpc/include/asm/pte-hash64.h
 create mode 100644 arch/powerpc/kernel/cpu_setup_fsl_booke.S
 create mode 100644 arch/powerpc/kernel/dbell.c
 rename arch/powerpc/mm/{mmap.c => mmap_64.c} (65%)
 create mode 100644 arch/powerpc/platforms/52xx/media5200.c
 create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_gpt.c
 create mode 100644 arch/powerpc/platforms/85xx/socrates.c
 create mode 100644 arch/powerpc/platforms/85xx/socrates_fpga_pic.c
 create mode 100644 arch/powerpc/platforms/85xx/socrates_fpga_pic.h
 create mode 100644 arch/powerpc/platforms/86xx/gef_ppc9a.c
 create mode 100644 arch/powerpc/platforms/86xx/gef_sbc310.c
 create mode 100644 arch/powerpc/platforms/amigaone/Kconfig
 create mode 100644 arch/powerpc/platforms/amigaone/Makefile
 create mode 100644 arch/powerpc/platforms/amigaone/setup.c
 create mode 100644 arch/powerpc/platforms/pseries/dtl.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

So here's the new ps3 nvram driver for 2.6.29 that we discussed earlier
(I actually sent this days ago but screwed up the email by not actually
sending it to you :-)

In the meantime I've added a PS3 defconfig update and two patches fixing
another fallout from the changes to the way we handle the coherent bit
in our PTEs. Hopefully there should be no more regressions in that area.

Cheers,
Ben.

The following changes since commit ee568b25ee9e160b32d1aef73d8b2ee9c05d34db:
  Linus Torvalds (1):
        Avoid 64-bit "switch()" statements on 32-bit architectures

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      Merge commit 'gcl/merge' into merge

Geert Uytterhoeven (1):
      ps3/block: Replace mtd/ps3vram by block/ps3vram

Geoff Levand (1):
      powerpc/ps3: ps3_defconfig updates

Kumar Gala (1):
      powerpc/mm: Respect _PAGE_COHERENT on classic ppc32 SW

Piotr Ziecik (1):
      powerpc/5200: Enable CPU_FTR_NEED_COHERENT for MPC52xx

 arch/powerpc/configs/ps3_defconfig  |  250 ++++++++---
 arch/powerpc/include/asm/cputable.h |    4 +-
 arch/powerpc/kernel/head_32.S       |    6 +-
 arch/powerpc/platforms/ps3/Kconfig  |    7 +
 drivers/block/Makefile              |    1 +
 drivers/block/ps3vram.c             |  865 +++++++++++++++++++++++++++++++++++
 drivers/mtd/devices/Kconfig         |    7 -
 drivers/mtd/devices/Makefile        |    1 -
 drivers/mtd/devices/ps3vram.c       |  768 -------------------------------
 9 files changed, 1069 insertions(+), 840 deletions(-)
 create mode 100644 drivers/block/ps3vram.c
 delete mode 100644 drivers/mtd/devices/ps3vram.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

So here's the new ps3 nvram driver for 2.6.29 that we discussed earlier

Cheers,
Ben.

The following changes since commit 9ead64974b05501bbac0d63a47c99fa786d064ba:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../sam/kbuild-fixes

are available in the git repository at:

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

Geert Uytterhoeven (1):
      ps3/block: Replace mtd/ps3vram by block/ps3vram

 arch/powerpc/platforms/ps3/Kconfig |    7 +
 drivers/block/Makefile             |    1 +
 drivers/block/ps3vram.c            |  865 ++++++++++++++++++++++++++++++++++++
 drivers/mtd/devices/Kconfig        |    7 -
 drivers/mtd/devices/Makefile       |    1 -
 drivers/mtd/devices/ps3vram.c      |  768 --------------------------------
 6 files changed, 873 insertions(+), 776 deletions(-)
 create mode 100644 drivers/block/ps3vram.c
 delete mode 100644 drivers/mtd/devices/ps3vram.c

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

[Linus Torvalds]

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

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

[Geert Uytterhoeven]

	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:   Geert.Uytterhoeven@sonycom.com
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

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

[Linus Torvalds]

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

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

[Benjamin Herrenschmidt]

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:   Geert.Uytterhoeven@sonycom.com
> 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

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

[Geert Uytterhoeven]

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:   Geert.Uytterhoeven@sonycom.com
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

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

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(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a fix for a USB related regression on some PowerPC machines.

The following changes since commit fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc:
  Linus Torvalds (1):
        Linux 2.6.29-rc7

are available in the git repository at:

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

Tony Breeds (1):
      powerpc: Run sbc610 USB fixup code only on the appropriate platform.

 arch/powerpc/platforms/86xx/gef_sbc610.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus

And here's another little regression fix. For some reason, that one was
done and acked ages ago, marked "accepted" in patchwork and never
actually merged anywhere ... go figure.

The following changes since commit 64e71303e44f3697e4568147caa966de74bdb4fb:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../mason/btrfs-unstable

are available in the git repository at:

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

Benjamin Herrenschmidt (1):
      powerpc/44x: Fix address decoding setup of PCI 2.x cells

 arch/powerpc/sysdev/ppc4xx_pci.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Please pull a few regression fixes for powerpc.

Cheers,
Ben.

The following changes since commit 169d418b127b98a3e464e9c4b807ad083760f98c:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6

are available in the git repository at:

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

Mark Nelson (2):
      powerpc: Fix 64bit memcpy() regression
      powerpc: Fix 64bit __copy_tofrom_user() regression

Michael Neuling (1):
      powerpc: Fix load/store float double alignment handler

 arch/powerpc/kernel/align.c    |   29 +++++++++++++----------------
 arch/powerpc/lib/copyuser_64.S |   38 +++++++++++++++++++++++++++++++-------
 arch/powerpc/lib/memcpy_64.S   |   26 ++++++++++++++++++++------
 3 files changed, 64 insertions(+), 29 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's 4 small powerpc fixes, a couple are regression in .29, and the
others are nasty enough bugs with trivial enough fixes that I deemed
then ok to go into .29 (and back into stable).

The following changes since commit b578f3fcca1e78624dfb5f358776e63711d7fda2:
  Linus Torvalds (1):
        Merge git://git.infradead.org/users/cbou/battery-2.6.29

are available in the git repository at:

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

Dave Hansen (1):
      powerpc/mm: Fix numa reserve bootmem page selection

Geoff Levand (1):
      powerpc/ps3: Move ps3_mm_add_memory to device_initcall

Michael Neuling (1):
      powerpc/vsx: Fix VSX alignment handler for regs 32-63

Philippe Gerum (1):
      powerpc/mm: Fix _PAGE_CHG_MASK to protect _PAGE_SPECIAL

 arch/powerpc/include/asm/pgtable-4k.h    |    2 +-
 arch/powerpc/include/asm/pgtable-64k.h   |    2 +-
 arch/powerpc/include/asm/pgtable-ppc32.h |    3 ++-
 arch/powerpc/kernel/align.c              |    7 ++++++-
 arch/powerpc/mm/numa.c                   |    5 +++--
 arch/powerpc/platforms/ps3/mm.c          |    2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

This is a single patch, to fix a regression introduced in this merge
window. Please apply.

The following changes since commit 1db8508cf483dc1ecf66141f90a7c03659d69512:
  Stefan Richter (1):
        hugetlbfs: fix build failure with !CONFIG_HUGETLBFS

are available in the git repository at:

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

Kumar Gala (1):
      powerpc/mm: Fix _PAGE_COHERENT support on classic ppc32 HW

 arch/powerpc/mm/hash_low_32.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

A few powerpc bits for you for 2.6.29. A few bug and regression fixes
(after this pull, it will be regressions only), a couple of board
device tree updates and some trivialities such as build breakage with
random config options due to missing includes.

Among others, this should solve the regressions with X being broken
on PowerMacs due to the legacy_mem files in sysfs returning an error on
mmap.

The following changes since commit 4c098bcd55fad34dcf224bf8343db6a9ac58fc68:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../mason/btrfs-unstable

are available in the git repository at:

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

Ananth N Mavinakayanahalli (1):
      powerpc: Don't emulate mr. instructions

Anton Vorontsov (2):
      powerpc/83xx: Fix missing #{address,size}-cells in mpc8313erdb.dts
      powerpc/83xx: Fix TSEC0 workability on MPC8313E-RDB boards

Benjamin Herrenschmidt (1):
      powerpc/pci: mmap anonymous memory when legacy_mem doesn't exist

Julia Lawall (1):
      arch/powerpc: Eliminate double sizeof

Kumar Gala (1):
      powerpc/fsl-booke: Fix mapping functions to use phys_addr_t

Michael Neuling (3):
      powerpc/83xx: Build breakage for CONFIG_PM but no CONFIG_SUSPEND
      powerpc/cell: Add missing #include for oprofile
      powerpc: Add missing sparsemem.h include

Steven Rostedt (1):
      powerpc/ftrace: Fix math to calculate offset in TOC

paulfax (1):
      powerpc/cpm2: Fix set interrupt type

 arch/powerpc/boot/dts/mpc8313erdb.dts           |   11 ++++-------
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig |    2 +-
 arch/powerpc/kernel/ftrace.c                    |    5 +++--
 arch/powerpc/kernel/pci-common.c                |   17 +++++++++++++++--
 arch/powerpc/lib/sstep.c                        |    2 ++
 arch/powerpc/mm/fsl_booke_mmu.c                 |    4 ++--
 arch/powerpc/mm/pgtable_32.c                    |    4 ++--
 arch/powerpc/oprofile/cell/spu_profiler.c       |    1 +
 arch/powerpc/platforms/82xx/pq2ads-pci-pic.c    |    2 +-
 arch/powerpc/platforms/pseries/hotplug-memory.c |    1 +
 arch/powerpc/sysdev/cpm2_pic.c                  |    2 +-
 arch/powerpc/sysdev/ipic.c                      |    2 +-
 12 files changed, 34 insertions(+), 19 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Please fine here some defconfig updates and a few small fixes for 2.6.29
The following changes since commit e4a7ca29039e615ce13a61b9c6abfb2aa394e9a1:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../gregkh/usb-2.6

are available in the git repository at:

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

Benjamin Herrenschmidt (2):
      Merge commit 'kumar/kumar-merge' into merge
      Merge commit 'jwb/jwb-merge' into merge

Gerhard Pircher (1):
      powerpc/mm: Fix handling of _PAGE_COHERENT in BAT setup code

Grant Erickson (1):
      powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info

Josh Boyer (4):
      powerpc/40x: Update PowerPC 40x defconfigs
      powerpc/44x: Update PowerPC 44x defconfigs
      powerpc/4xx: Update multi-board PowerPC 4xx defconfigs
      powerpc: Remove arch/ppc cruft from Kconfig

Kumar Gala (6):
      powerpc/85xx: Fix typo in mpc8572ds dts
      powerpc/85xx: Update defconfigs
      powerpc/83xx: Update defconfigs
      powerpc/86xx: Update defconfigs
      powerpc/8xx: Update defconfigs
      powerpc/embedded6xx: Update defconfigs

Li Yang (1):
      powerpc/mpc8313erdb: fix kernel panic because mdio device is not probed

Robert Jennings (1):
      powerpc/pseries: Correct VIO bus accounting problem in CMO env.

Sean MacLennan (1):
      powerpc/44x: Warp patches for the new NDFC driver

Stephen Rothwell (2):
      powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c
      powerpc: More printing warning fixes for the l64 to ll64 conversion

 arch/powerpc/Kconfig                              |    4 -
 arch/powerpc/boot/cuboot-warp.c                   |   43 ------
 arch/powerpc/boot/dts/haleakala.dts               |    5 +-
 arch/powerpc/boot/dts/kilauea.dts                 |    5 +-
 arch/powerpc/boot/dts/makalu.dts                  |    5 +-
 arch/powerpc/boot/dts/mpc8313erdb.dts             |    2 +-
 arch/powerpc/boot/dts/mpc8572ds.dts               |    2 +-
 arch/powerpc/boot/dts/warp.dts                    |   42 ++++++-
 arch/powerpc/configs/40x/acadia_defconfig         |   76 ++++++++---
 arch/powerpc/configs/40x/ep405_defconfig          |   87 ++++++++++---
 arch/powerpc/configs/40x/hcu4_defconfig           |   78 +++++++++---
 arch/powerpc/configs/40x/kilauea_defconfig        |   76 ++++++++---
 arch/powerpc/configs/40x/makalu_defconfig         |   76 ++++++++---
 arch/powerpc/configs/40x/virtex_defconfig         |   53 ++++++---
 arch/powerpc/configs/40x/walnut_defconfig         |   84 +++++++++---
 arch/powerpc/configs/44x/arches_defconfig         |   60 ++++++---
 arch/powerpc/configs/44x/bamboo_defconfig         |   76 ++++++++---
 arch/powerpc/configs/44x/canyonlands_defconfig    |   60 ++++++---
 arch/powerpc/configs/44x/ebony_defconfig          |   84 +++++++++---
 arch/powerpc/configs/44x/katmai_defconfig         |   76 ++++++++---
 arch/powerpc/configs/44x/rainier_defconfig        |   83 +++++++++---
 arch/powerpc/configs/44x/sam440ep_defconfig       |   77 ++++++++---
 arch/powerpc/configs/44x/sequoia_defconfig        |   83 +++++++++---
 arch/powerpc/configs/44x/taishan_defconfig        |   83 +++++++++---
 arch/powerpc/configs/44x/virtex5_defconfig        |   53 ++++++---
 arch/powerpc/configs/44x/warp_defconfig           |  138 +++++++++++++++-----
 arch/powerpc/configs/83xx/asp8347_defconfig       |   91 +++++++++----
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |  103 +++++++++++----
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |  103 +++++++++++----
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |   86 +++++++++----
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |   89 +++++++++----
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |  100 ++++++++++-----
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |   98 ++++++++++-----
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |   84 ++++++++----
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |   93 ++++++++++----
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |   88 +++++++++----
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |   84 +++++++++----
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |   90 +++++++++----
 arch/powerpc/configs/83xx/sbc834x_defconfig       |   74 +++++++----
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   79 ++++++++----
 arch/powerpc/configs/85xx/mpc8536_ds_defconfig    |  111 ++++++++++++----
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   66 +++++++---
 arch/powerpc/configs/85xx/mpc8544_ds_defconfig    |  111 ++++++++++++----
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   73 ++++++++---
 arch/powerpc/configs/85xx/mpc8568mds_defconfig    |   86 +++++++++----
 arch/powerpc/configs/85xx/mpc8572_ds_defconfig    |   80 +++++++++---
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   69 +++++++---
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   60 ++++++---
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   66 +++++++---
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |   88 +++++++++----
 arch/powerpc/configs/85xx/tqm8540_defconfig       |   81 +++++++++----
 arch/powerpc/configs/85xx/tqm8541_defconfig       |   88 +++++++++----
 arch/powerpc/configs/85xx/tqm8548_defconfig       |   84 +++++++++----
 arch/powerpc/configs/85xx/tqm8555_defconfig       |   88 +++++++++----
 arch/powerpc/configs/85xx/tqm8560_defconfig       |   88 +++++++++----
 arch/powerpc/configs/86xx/gef_sbc610_defconfig    |  136 +++++++++++++++-----
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig  |   83 +++++++++----
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig  |  111 ++++++++++++-----
 arch/powerpc/configs/86xx/sbc8641d_defconfig      |  102 +++++++++++----
 arch/powerpc/configs/adder875_defconfig           |   65 ++++++---
 arch/powerpc/configs/c2k_defconfig                |  118 ++++++++++++-----
 arch/powerpc/configs/ep8248e_defconfig            |   77 ++++++++----
 arch/powerpc/configs/ep88xc_defconfig             |   65 ++++++---
 arch/powerpc/configs/linkstation_defconfig        |  110 ++++++++++------
 arch/powerpc/configs/mgcoge_defconfig             |   74 ++++++++---
 arch/powerpc/configs/mgsuvd_defconfig             |   63 ++++++---
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |   71 +++++++----
 arch/powerpc/configs/mpc8272_ads_defconfig        |   77 ++++++++----
 arch/powerpc/configs/mpc83xx_defconfig            |  107 +++++++++++-----
 arch/powerpc/configs/mpc85xx_defconfig            |  120 +++++++++++++-----
 arch/powerpc/configs/mpc866_ads_defconfig         |   64 ++++++---
 arch/powerpc/configs/mpc86xx_defconfig            |  143 ++++++++++++++++-----
 arch/powerpc/configs/mpc885_ads_defconfig         |   65 ++++++---
 arch/powerpc/configs/ppc40x_defconfig             |   77 +++++++++---
 arch/powerpc/configs/ppc44x_defconfig             |   79 +++++++++---
 arch/powerpc/configs/pq2fads_defconfig            |   87 +++++++++----
 arch/powerpc/configs/prpmc2800_defconfig          |   96 ++++++++++----
 arch/powerpc/configs/storcenter_defconfig         |   85 ++++++++----
 arch/powerpc/kernel/vio.c                         |    7 +-
 arch/powerpc/mm/ppc_mmu_32.c                      |    6 +-
 arch/powerpc/platforms/44x/Makefile               |    1 -
 arch/powerpc/platforms/44x/warp-nand.c            |  135 -------------------
 arch/powerpc/platforms/83xx/mpc831x_rdb.c         |    1 +
 arch/powerpc/platforms/pseries/phyp_dump.c        |   26 ++--
 drivers/edac/cell_edac.c                          |    8 +-
 drivers/mtd/nand/fsl_elbc_nand.c                  |    8 +-
 drivers/mtd/nand/pasemi_nand.c                    |    4 +-
 87 files changed, 4353 insertions(+), 1930 deletions(-)
 delete mode 100644 arch/powerpc/platforms/44x/warp-nand.c

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here are mostly a bunch of fixups for the u64 change in the PS3 code which
was pretty bad in that area. For bits out of arch/powerpc, we generally have
either subsystem maintainer explicit ack or verbal ack via email or irc. Only
davem didn't have a chance to reply yet so I left the drivers/net patch out.

The rest is a 3 bug fixes and one little one liner that got lost in the
noise adding an UART type to our OF driver wrapper.

Cheers,
Ben.

The following changes since commit 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7:
  Linus Torvalds (1):
        Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

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

Dave Kleikamp (1):
      powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices

Hendrik Brueckner (1):
      hvc_console: Remove tty->low_latency

Matthias Fuchs (1):
      serial: Add 16850 uart type support to OF uart driver

Michael Neuling (1):
      powerpc: Get the number of SLBs from "slb-size" property

Stephen Rothwell (13):
      powerpc: Cleanup from l64 to ll64 change drivers/scsi
      powerpc/ps3: set_dabr() takes an unsigned long
      powerpc/ps3: Use dma_addr_t down through the stack
      powerpc/ps3: The lv1_ routines have u64 parameters
      powerpc/ps3: clear_bit()/set_bit() operate on unsigned longs
      powerpc/ps3: ps3_repository_read_mm_info() takes u64 * arguments
      powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc
      powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block
      powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/char
      powerpc/ps3: Printing fixups for l64 to ll64 conversion sound/ppc
      powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3
      powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/scsi
      powerpc/ps3: printing fixups for l64 to ll64 conversion drivers/video

 arch/powerpc/include/asm/ps3.h           |    8 +-
 arch/powerpc/kernel/prom.c               |    5 ++
 arch/powerpc/mm/slice.c                  |   11 +++-
 arch/powerpc/platforms/ps3/device-init.c |   26 ++++----
 arch/powerpc/platforms/ps3/htab.c        |    2 +-
 arch/powerpc/platforms/ps3/interrupt.c   |   28 +++++----
 arch/powerpc/platforms/ps3/mm.c          |   97 ++++++++++++++++--------------
 arch/powerpc/platforms/ps3/os-area.c     |    2 +-
 arch/powerpc/platforms/ps3/repository.c  |   22 ++++----
 arch/powerpc/platforms/ps3/setup.c       |    2 +-
 arch/powerpc/platforms/ps3/spu.c         |   12 +++-
 arch/powerpc/platforms/ps3/system-bus.c  |   14 +++--
 drivers/block/ps3disk.c                  |   18 +++---
 drivers/char/hvc_console.c               |    2 -
 drivers/char/ps3flash.c                  |   18 +++---
 drivers/ps3/ps3-lpm.c                    |   16 +++---
 drivers/ps3/ps3-vuart.c                  |   32 +++++-----
 drivers/ps3/ps3stor_lib.c                |   14 ++--
 drivers/scsi/ibmvscsi/ibmvfc.c           |   14 ++--
 drivers/scsi/ibmvscsi/ibmvfc.h           |    6 +-
 drivers/scsi/ps3rom.c                    |    6 +-
 drivers/serial/of_serial.c               |    1 +
 drivers/video/ps3fb.c                    |    4 +-
 sound/ppc/snd_ps3.c                      |    4 +-
 24 files changed, 196 insertions(+), 168 deletions(-)

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's another batch for before -rc2. The main highlight is the u64 conversion
to unsigned long long along with a bunch of patches fixing warnings due to this
conversion. There will be a few more, for example the PS3 code is still pretty
bad in this area, but that's about it.

The rest is mostly bug fixes, moving a driver around as requested by a maintainer,
a couple of trivial things, and a few late embedded changes that were posted
before the merge window, but some maintainer needed more time than others to
recover from whatever he got intoxicated with over new year :-)

After that, I'm opening my next branch for .30 material and merge will be
regressions and severe bugs only.

Cheers,
Ben.

The following changes since commit a6525042bfdfcab128bd91fad264de10fd24a55e:
  Linus Torvalds (1):
        Merge branch 'x86-pat-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

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

Anton Vorontsov (2):
      powerpc/83xx: Make serial ports work on MPC8315E-RDB w/ FSL U-Boots
      powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/

Benjamin Herrenschmidt (3):
      Merge commit 'kumar/kumar-next' into next
      Merge commit 'gcl/gcl-next' into next
      powerpc/powermac: Fix occasional SMP boot failure

Grant Likely (1):
      powerpc/mpc52xx: Properly update irq_desc when set_type() is called.

Ingo Molnar (1):
      powerpc: Change u64/s64 to a long long integer type

Jason Jin (1):
      powerpc: Fix the ide suspend function in uli1575

John Linn (1):
      Xilinx: SPI: updated driver for device tree

Jon Smirl (1):
      drivers/of: Add the of_find_i2c_device_by_node function.

Kumar Gala (2):
      powerpc/85xx: Fix PCIe error interrupts
      powerpc/e500mc: Doorbells need to be taken w/exceptions disabled

Michael Ellerman (1):
      powerpc: Enable PS3 options and QPACE in ppc64_defconfig

Milton Miller (6):
      powerpc: Make dummy section a valid note header
      powerpc/kexec: Check crash_base for relocatable kernel
      hvc_console: Change an mb() to smp_mb() and add some comments
      hvc_console: Call free_irq() only if request_irq() was successful
      hvc_console: Do not set low_latency when using interrupts
      hvc_console: Use kzalloc() instead of kmalloc() + memset()

Nathan Lynch (1):
      powerpc/cacheinfo: Rename cache_dir per-cpu variable

Stephen Rothwell (3):
      powerpc: Cleanup from l64 to ll64 change: arch code
      powerpc: Cleanup from l64 to ll64 change: drivers/char
      powerpc: Cleanup from l64 to ll64 change: drivers/net

Timur Tabi (1):
      powerpc/qe: add Ethernet UPSMR definitions to QE library

Trent Piepho (4):
      powerpc/fsl-pci: Better ATMU setup for 85xx/86xx
      powerpc/fsl-pci: Set relaxed ordering on prefetchable ranges
      powerpc/fsl-booke: Don't hard-code size of struct tlbcam
      powerpc/fsl-booke: Remove num_tlbcam_entries

Wolfram Sang (1):
      powerpc/mpc52xx: remove dead code from GPIO driver

Yuri Tikhonov (1):
      powerpc/xsysace: add compatible string for non-ipcore instance

roel kluin (1):
      powerpc/mpc5121: fix NULL test in mpc5121_clk_get utility function.

 arch/powerpc/boot/dts/mpc8315erdb.dts              |    4 +-
 arch/powerpc/boot/dts/mpc8544ds.dts                |    4 +-
 arch/powerpc/boot/dts/mpc8572ds.dts                |    4 +-
 arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts     |    2 +-
 arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts     |    2 +-
 arch/powerpc/configs/ppc64_defconfig               |   26 ++++-
 arch/powerpc/include/asm/qe.h                      |   19 +++-
 arch/powerpc/include/asm/rtas.h                    |    2 +-
 arch/powerpc/include/asm/types.h                   |    7 +-
 arch/powerpc/kernel/asm-offsets.c                  |    7 +
 arch/powerpc/kernel/cacheinfo.c                    |   10 +-
 arch/powerpc/kernel/dma-iommu.c                    |    4 +-
 arch/powerpc/kernel/head_64.S                      |    9 ++
 arch/powerpc/kernel/head_fsl_booke.S               |    8 +-
 arch/powerpc/kernel/iommu.c                        |   12 +-
 arch/powerpc/kernel/lparcfg.c                      |   10 +-
 arch/powerpc/kernel/machine_kexec.c                |   25 ++++
 arch/powerpc/kernel/pci_64.c                       |    6 +-
 arch/powerpc/kernel/setup_64.c                     |    6 +-
 arch/powerpc/kernel/vmlinux.lds.S                  |    4 +-
 arch/powerpc/mm/fsl_booke_mmu.c                    |    9 +-
 arch/powerpc/mm/mmu_decl.h                         |   11 ++-
 arch/powerpc/mm/stab.c                             |    4 +-
 arch/powerpc/oprofile/op_model_pa6t.c              |    6 +-
 arch/powerpc/platforms/512x/clock.c                |    4 +-
 arch/powerpc/platforms/52xx/mpc52xx_gpio.c         |    3 -
 arch/powerpc/platforms/52xx/mpc52xx_pic.c          |    8 +-
 arch/powerpc/platforms/83xx/Makefile               |    1 +
 .../powerpc/platforms/83xx}/mcu_mpc8349emitx.c     |    0
 arch/powerpc/platforms/Kconfig                     |   11 ++
 arch/powerpc/platforms/cell/beat_interrupt.c       |    2 +-
 arch/powerpc/platforms/cell/celleb_scc_epci.c      |    4 +-
 arch/powerpc/platforms/cell/iommu.c                |    4 +-
 arch/powerpc/platforms/cell/ras.c                  |    8 +-
 arch/powerpc/platforms/cell/spu_base.c             |    4 +-
 arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
 arch/powerpc/platforms/cell/spufs/coredump.c       |    2 +-
 arch/powerpc/platforms/cell/spufs/fault.c          |    2 +-
 arch/powerpc/platforms/cell/spufs/file.c           |    6 +-
 arch/powerpc/platforms/fsl_uli1575.c               |    1 +
 arch/powerpc/platforms/iseries/iommu.c             |    4 +-
 arch/powerpc/platforms/powermac/smp.c              |    2 +-
 arch/powerpc/platforms/pseries/iommu.c             |   35 +++---
 arch/powerpc/sysdev/fsl_pci.c                      |  107 +++++++++++-----
 arch/powerpc/sysdev/mpic.c                         |    2 +-
 drivers/block/xsysace.c                            |    1 +
 drivers/char/bsr.c                                 |    2 +-
 drivers/char/hvc_console.c                         |   14 +-
 drivers/char/hvc_irq.c                             |    2 +-
 drivers/i2c/chips/Kconfig                          |   11 --
 drivers/i2c/chips/Makefile                         |    1 -
 drivers/net/ehea/ehea_main.c                       |    8 +-
 drivers/net/ehea/ehea_qmr.c                        |   18 ++--
 drivers/net/ibmveth.c                              |   16 +-
 drivers/net/iseries_veth.c                         |    2 +-
 drivers/net/pasemi_mac.c                           |    6 +-
 drivers/of/of_i2c.c                                |   19 +++
 drivers/pcmcia/electra_cf.c                        |    2 +-
 drivers/scsi/ibmvscsi/ibmvscsi.c                   |   12 +-
 drivers/spi/xilinx_spi.c                           |  137 ++++++++++++--------
 include/linux/of_i2c.h                             |    3 +
 61 files changed, 423 insertions(+), 244 deletions(-)
 rename {drivers/i2c/chips => arch/powerpc/platforms/83xx}/mcu_mpc8349emitx.c (100%)

[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 three more commits that fix bugs causing kernel crashes on
powerpc.

Thanks,
Paul.

 arch/powerpc/mm/hugetlbpage.c          |    3 +++
 arch/powerpc/mm/numa.c                 |   16 +++++++++++-----
 arch/powerpc/platforms/cell/axon_msi.c |    3 +++
 3 files changed, 17 insertions(+), 5 deletions(-)

commit 23e0e8afafd9ac065d81506524adf3339584044b
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Fri Dec 12 09:19:50 2008 +0000

    powerpc/cell/axon-msi: Fix MSI after kexec
    
    Commit d015fe995 'powerpc/cell/axon-msi: Retry on missing interrupt'
    has turned a rare failure to kexec on QS22 into a reproducible
    error, which we have now analysed.
    
    The problem is that after a kexec, the MSIC hardware still points
    into the middle of the old ring buffer.  We set up the ring buffer
    during reboot, but not the offset into it.  On older kernels, this
    would cause a storm of thousands of spurious interrupts after a
    kexec, which would most of the time get dropped silently.
    
    With the new code, we time out on each interrupt, waiting for
    it to become valid.  If more interrupts come in that we time
    out on, this goes on indefinitely, which eventually leads to
    a hard crash.
    
    The solution in this commit is to read the current offset from
    the MSIC when reinitializing it.  This now works correctly, as
    expected.
    
    Reported-by: Dirk Herrendoerfer <d.herrendoerfer@de.ibm.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Acked-by: Michael Ellerman <michael@ellerman.id.au>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit a4c74ddd5ea3db53fc73d29c222b22656a7d05be
Author: Dave Hansen <dave@linux.vnet.ibm.com>
Date:   Thu Dec 11 08:36:06 2008 +0000

    powerpc: Fix bootmem reservation on uninitialized node
    
    careful_allocation() was calling into the bootmem allocator for
    nodes which had not been fully initialized and caused a previous
    bug:  http://patchwork.ozlabs.org/patch/10528/  So, I merged a
    few broken out loops in do_init_bootmem() to fix it.  That changed
    the code ordering.
    
    I think this bug is triggered by having reserved areas for a node
    which are spanned by another node's contents.  In the
    mark_reserved_regions_for_nid() code, we attempt to reserve the
    area for a node before we have allocated the NODE_DATA() for that
    nid.  We do this since I reordered that loop.  I suck.
    
    This is causing crashes at bootup on some systems, as reported
    by Jon Tollefson.
    
    This may only present on some systems that have 16GB pages
    reserved.  But, it can probably happen on any system that is
    trying to reserve large swaths of memory that happen to span other
    nodes' contents.
    
    This commit ensures that we do not touch bootmem for any node which
    has not been initialized, and also removes a compile warning about
    an unused variable.
    
    Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 48f797de550d39ea35552646c34149991362ff7f
Author: Brian King <brking@linux.vnet.ibm.com>
Date:   Thu Dec 4 04:07:54 2008 +0000

    powerpc: Check for valid hugepage size in hugetlb_get_unmapped_area
    
    It looks like most of the hugetlb code is doing the correct thing if
    hugepages are not supported, but the mmap code is not.  If we get into
    the mmap code when hugepages are not supported, such as in an LPAR
    which is running Active Memory Sharing, we can oops the kernel.  This
    fixes the oops being seen in this path.
    
    oops: Kernel access of bad area, sig: 11 [#1]
    SMP NR_CPUS=1024 NUMA pSeries
    Modules linked in: nfs(N) lockd(N) nfs_acl(N) sunrpc(N) ipv6(N) fuse(N) loop(N)
    dm_mod(N) sg(N) ibmveth(N) sd_mod(N) crc_t10dif(N) ibmvscsic(N)
    scsi_transport_srp(N) scsi_tgt(N) scsi_mod(N)
    Supported: No
    NIP: c000000000038d60 LR: c00000000003945c CTR: c0000000000393f0
    REGS: c000000077e7b830 TRAP: 0300   Tainted: G
    (2.6.27.5-bz50170-2-ppc64)
    MSR: 8000000000009032 <EE,ME,IR,DR>  CR: 44000448  XER: 20000001
    DAR: c000002000af90a8, DSISR: 0000000040000000
    TASK = c00000007c1b8600[4019] 'hugemmap01' THREAD: c000000077e78000 CPU: 6
    GPR00: 0000001fffffffe0 c000000077e7bab0 c0000000009a4e78 0000000000000000
    GPR04: 0000000000010000 0000000000000001 00000000ffffffff 0000000000000001
    GPR08: 0000000000000000 c000000000af90c8 0000000000000001 0000000000000000
    GPR12: 000000000000003f c000000000a73880 0000000000000000 0000000000000000
    GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000010000
    GPR20: 0000000000000000 0000000000000003 0000000000010000 0000000000000001
    GPR24: 0000000000000003 0000000000000000 0000000000000001 ffffffffffffffb5
    GPR28: c000000077ca2e80 0000000000000000 c00000000092af78 0000000000010000
    NIP [c000000000038d60] .slice_get_unmapped_area+0x6c/0x4e0
    LR [c00000000003945c] .hugetlb_get_unmapped_area+0x6c/0x80
    Call Trace:
    [c000000077e7bbc0] [c00000000003945c] .hugetlb_get_unmapped_area+0x6c/0x80
    [c000000077e7bc30] [c000000000107e30] .get_unmapped_area+0x64/0xd8
    [c000000077e7bcb0] [c00000000010b140] .do_mmap_pgoff+0x140/0x420
    [c000000077e7bd80] [c00000000000bf5c] .sys_mmap+0xc4/0x140
    [c000000077e7be30] [c0000000000086b4] syscall_exit+0x0/0x40
    Instruction dump:
    fac1ffb0 fae1ffb8 fb01ffc0 fb21ffc8 fb41ffd0 fb61ffd8 fb81ffe0 fbc1fff0
    fbe1fff8 f821fef1 f8c10158 f8e10160 <7d49002e> f9010168 e92d01b0 eb4902b0
    
    Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

[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 two more small commits for powerpc; one is a very small
defconfig update, and the other fixes a bug that can lead to an oops
on some 440-family embedded powerpc processors.

Thanks,
Paul.

 arch/powerpc/configs/83xx/mpc834x_itx_defconfig |    2 +-
 arch/powerpc/configs/mpc83xx_defconfig          |    2 +-
 arch/powerpc/kernel/cpu_setup_44x.S             |    1 +
 arch/powerpc/kernel/cputable.c                  |    3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

Anton Vorontsov (1):
      powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs

Grant Likely (1):
      powerpc/virtex5: Fix Virtex5 machine check handling

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

[Paul Mackerras]

I wrote:

> Please pull from the 'merge' branch of
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
> 
> to get one commit from Ben Herrenschmidt that fixes a regression since
> 2.6.27.

I have just added one more commit from Kumar's merge branch, so when
you pull the diffstat should be:

 arch/powerpc/boot/dts/mpc8349emitx.dts |   16 ++++++++--------
 arch/powerpc/kernel/dma.c              |    1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

If you had already pulled, please pull again, or pull Kumar's merge
branch directly.

Thanks,
Paul.

Anton Vorontsov (1):
      powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts

Benjamin Herrenschmidt (1):
      powerpc: Fix dma_map_sg() cache flushing on non coherent platforms

[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 one commit from Ben Herrenschmidt that fixes a regression since
2.6.27.

Thanks,
Paul.

 arch/powerpc/kernel/dma.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 2434bbb30e79468c49cff3cff6005236f55ed188
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Sun Nov 30 18:53:40 2008 +0000

    powerpc: Fix dma_map_sg() cache flushing on non coherent platforms
    
    On PowerPC 4xx or other non cache-coherent platforms, we lost the
    appropriate cache flushing in dma_map_sg() when merging the 32 and
    64-bit DMA code (commit 4fc665b88a79a45bae8bbf3a05563c27c7337c3d,
    "powerpc: Merge 32 and 64-bit dma code").  This restores it.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Becky Bruce <beckyb@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

[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 set of fixes for various powerpc regressions, build failures
and serious bugs that have accumulated since my last pull request,
plus some defconfig updates.

This includes commits pulled from the submaintainers for embedded
powerpc platforms.  In one case there was a fix that I thought was
marginal (making a printk print correct numbers rather than garbage)
but I let it through since it is in platform-specific code and
therefore can't hurt other platforms.  If you disagree, let me know
and I'll redo the branch.

Thanks,
Paul.

 arch/powerpc/boot/dts/mpc832x_rdb.dts          |    4 
 arch/powerpc/boot/dts/mpc8572ds.dts            |    2 
 arch/powerpc/configs/40x/virtex_defconfig      | 1176 ++++++++++++++++++++++++
 arch/powerpc/configs/44x/virtex5_defconfig     |  234 +++--
 arch/powerpc/configs/52xx/cm5200_defconfig     |  169 +++
 arch/powerpc/configs/52xx/lite5200b_defconfig  |  206 +++-
 arch/powerpc/configs/52xx/motionpro_defconfig  |  168 +++
 arch/powerpc/configs/52xx/pcm030_defconfig     |  182 +++-
 arch/powerpc/configs/52xx/tqm5200_defconfig    |  180 +++-
 arch/powerpc/configs/86xx/gef_sbc610_defconfig |    2 
 arch/powerpc/configs/mpc5200_defconfig         |  573 +++++++++---
 arch/powerpc/configs/ppc40x_defconfig          |   92 ++
 arch/powerpc/configs/ppc44x_defconfig          |   92 ++
 arch/powerpc/kernel/cpu_setup_44x.S            |    7 
 arch/powerpc/kernel/entry_64.S                 |    8 
 arch/powerpc/kernel/prom_parse.c               |    7 
 arch/powerpc/mm/40x_mmu.c                      |   16 
 arch/powerpc/mm/numa.c                         |  122 ++
 arch/powerpc/platforms/cell/axon_msi.c         |   36 +
 arch/powerpc/platforms/cell/smp.c              |    9 
 arch/powerpc/platforms/cell/spufs/file.c       |    3 
 arch/powerpc/sysdev/bestcomm/Kconfig           |    9 
 arch/powerpc/sysdev/mpic.c                     |    9 
 arch/powerpc/sysdev/xilinx_intc.c              |    4 
 drivers/block/xsysace.c                        |   23 
 drivers/char/xilinx_hwicap/xilinx_hwicap.c     |    9 
 drivers/net/Kconfig                            |    3 
 drivers/serial/uartlite.c                      |    4 
 drivers/video/xilinxfb.c                       |    5 
 sound/soc/fsl/Kconfig                          |    3 
 30 files changed, 2776 insertions(+), 581 deletions(-)
 create mode 100644 arch/powerpc/configs/40x/virtex_defconfig

Adhemerval Zanella (1):
      powerpc: Fix IRQ assignment for some PCIe devices

Arnd Bergmann (3):
      powerpc/cell/axon-msi: Retry on missing interrupt
      powerpc/mpic: Don't reset affinity for secondary MPIC on boot
      powerpc/cell: Fix GDB watchpoints, again

Benjamin Herrenschmidt (1):
      powerpc/44x: Fix 460EX/460GT machine check handling

Dave Hansen (1):
      powerpc: Fix boot freeze on machine with empty memory node

Grant Erickson (1):
      powerpc/40x: Limit allocable DRAM during early mapping

Grant Likely (4):
      powerpc/mpc5200: fix bestcomm Kconfig dependencies
      powerpc/virtex: fix various format/casting printk mismatches
      powerpc/52xx: update defconfigs
      powerpc/virtex: Update defconfigs

Jeremy Kerr (1):
      powerpc/spufs: Fix spinning in spufs_ps_fault on signal

Martyn Welch (1):
      powerpc: Use generic PHY driver for Marvell 88E1111 PHY on GE Fanuc SBC610

Michael Barkowski (1):
      powerpc/mpc832x_rdb: fix swapped ethernet ids

Paul Mackerras (1):
      powerpc: Fix system calls on Cell entered with XER.SO=1

Trent Piepho (1):
      powerpc/85xx: L2 cache size wrong in 8572DS dts

Yuri Tikhonov (1):
      xsysace: Fix driver to use resource_size_t instead of unsigned long

[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

It's mostly defconfig updates, but there are also fixes for a few
regressions, oopses, serious bugs, and documentation errors on
powerpc.

Thanks,
Paul.

 Documentation/powerpc/booting-without-of.txt      |   65 +----
 arch/powerpc/boot/dts/gef_sbc610.dts              |    2 
 arch/powerpc/configs/83xx/asp8347_defconfig       |  121 +++++----
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |  158 +++++++-----
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |  158 +++++++-----
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |  125 +++++----
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |  136 ++++++----
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |  171 +++++++++----
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |  121 +++++----
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |  123 +++++----
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |  126 +++++----
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |  119 +++++----
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |  123 +++++----
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |  155 +++++++----
 arch/powerpc/configs/83xx/sbc834x_defconfig       |  119 +++++----
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   87 ++++--
 arch/powerpc/configs/85xx/mpc8536_ds_defconfig    |  143 +++++++++--
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   74 ++++-
 arch/powerpc/configs/85xx/mpc8544_ds_defconfig    |  143 +++++++++--
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   90 +++++--
 arch/powerpc/configs/85xx/mpc8568mds_defconfig    |   93 +++++--
 arch/powerpc/configs/85xx/mpc8572_ds_defconfig    |  143 +++++++++--
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   91 +++++--
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   75 ++++--
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   78 ++++--
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |  115 ++++++--
 arch/powerpc/configs/85xx/tqm8540_defconfig       |   91 +++++--
 arch/powerpc/configs/85xx/tqm8541_defconfig       |   96 +++++--
 arch/powerpc/configs/85xx/tqm8548_defconfig       |   98 +++++--
 arch/powerpc/configs/85xx/tqm8555_defconfig       |   96 +++++--
 arch/powerpc/configs/85xx/tqm8560_defconfig       |   96 +++++--
 arch/powerpc/configs/86xx/gef_sbc610_defconfig    |  281 +++++++++++++++------
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig  |  177 +++++++++----
 arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig  |  175 +++++++++----
 arch/powerpc/configs/86xx/sbc8641d_defconfig      |  152 +++++++----
 arch/powerpc/configs/adder875_defconfig           |   69 +++--
 arch/powerpc/configs/c2k_defconfig                |  179 ++++++++-----
 arch/powerpc/configs/chrp32_defconfig             |  159 +++++++++---
 arch/powerpc/configs/ep8248e_defconfig            |  113 +++++---
 arch/powerpc/configs/ep88xc_defconfig             |   67 +++--
 arch/powerpc/configs/g5_defconfig                 |  142 ++++++++--
 arch/powerpc/configs/iseries_defconfig            |  114 ++++++--
 arch/powerpc/configs/linkstation_defconfig        |  122 +++++++--
 arch/powerpc/configs/maple_defconfig              |  142 ++++++++--
 arch/powerpc/configs/mgcoge_defconfig             |  234 ++++++++++++++---
 arch/powerpc/configs/mgsuvd_defconfig             |  107 +++++---
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |   78 ++++--
 arch/powerpc/configs/mpc8272_ads_defconfig        |  113 +++++---
 arch/powerpc/configs/mpc83xx_defconfig            |  156 +++++++----
 arch/powerpc/configs/mpc85xx_defconfig            |  145 +++++++++--
 arch/powerpc/configs/mpc866_ads_defconfig         |   77 ++++--
 arch/powerpc/configs/mpc86xx_defconfig            |  144 +++++++++--
 arch/powerpc/configs/mpc885_ads_defconfig         |   67 +++--
 arch/powerpc/configs/pmac32_defconfig             |  160 +++++++++---
 arch/powerpc/configs/ppc64_defconfig              |  174 ++++++++++---
 arch/powerpc/configs/ppc6xx_defconfig             |  286 +++++++++++++++------
 arch/powerpc/configs/pq2fads_defconfig            |  137 ++++++----
 arch/powerpc/configs/prpmc2800_defconfig          |  126 +++++++--
 arch/powerpc/configs/pseries_defconfig            |  169 ++++++++++--
 arch/powerpc/configs/storcenter_defconfig         |   83 ++++--
 arch/powerpc/include/asm/immap_cpm2.h             |    9 -
 arch/powerpc/include/asm/immap_qe.h               |    5 
 arch/powerpc/kernel/misc_32.S                     |    4 
 arch/powerpc/kernel/signal_32.c                   |   18 +
 drivers/watchdog/booke_wdt.c                      |    5 
 65 files changed, 5305 insertions(+), 2315 deletions(-)

Andreas Schwab (1):
      powerpc: Fix msr check in compat_sys_swapcontext

Kumar Gala (2):
      powerpc/fsl-booke: Fix synchronization bug w/local tlb invalidates
      powerpc: Updated Freescale PPC related defconfigs

Li Yang (1):
      powerpc: Update QE/CPM2 usb_ctlr structures for USB support

Martyn Welch (1):
      powerpc/86xx: Correct SOC bus-frequency in GE Fanuc SBC610 DTS

Matthias Fuchs (1):
      powerpc: Fix Book-E watchdog timer interval setting

Paul Mackerras (1):
      powerpc: Update desktop/server defconfigs

Trent Piepho (1):
      powerpc: Repair device bindings documentation

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

[Paul Mackerras]

Linus,

Since I sent the pull request, I have added one more commit to my
merge branch, which reverts the commit that Mel Gorman identified as
causing NVRAM corruption (plus another commit that depended on it).

So when you do this:

> Please pull from the 'merge' branch of
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

you'll see this commit in addition:

Paul Mackerras (1):
      Revert "powerpc: Sync RPA note in zImage with kernel's RPA note"

I have included the overall diffstat below.

Thanks,
Paul.

 arch/powerpc/boot/addnote.c                      |  175 ++++++----------------
 arch/powerpc/boot/dts/mpc8313erdb.dts            |   39 -----
 arch/powerpc/boot/libfdt/fdt_ro.c                |    9 +
 arch/powerpc/boot/main.c                         |    2 
 arch/powerpc/boot/wrapper                        |    9 -
 arch/powerpc/configs/40x/acadia_defconfig        |   59 +++++--
 arch/powerpc/configs/40x/ep405_defconfig         |   83 +++++++---
 arch/powerpc/configs/40x/hcu4_defconfig          |  125 +++++++++++-----
 arch/powerpc/configs/40x/kilauea_defconfig       |   69 ++++++---
 arch/powerpc/configs/40x/makalu_defconfig        |   69 ++++++---
 arch/powerpc/configs/40x/walnut_defconfig        |   77 +++++++---
 arch/powerpc/configs/44x/arches_defconfig        |   51 ++++--
 arch/powerpc/configs/44x/bamboo_defconfig        |   77 +++++++---
 arch/powerpc/configs/44x/canyonlands_defconfig   |   61 +++++---
 arch/powerpc/configs/44x/ebony_defconfig         |   77 +++++++---
 arch/powerpc/configs/44x/katmai_defconfig        |   77 +++++++---
 arch/powerpc/configs/44x/rainier_defconfig       |   73 ++++++---
 arch/powerpc/configs/44x/sam440ep_defconfig      |  110 ++++++++++----
 arch/powerpc/configs/44x/sequoia_defconfig       |   78 +++++++---
 arch/powerpc/configs/44x/taishan_defconfig       |   77 +++++++---
 arch/powerpc/configs/44x/warp_defconfig          |   82 +++++++---
 arch/powerpc/configs/linkstation_defconfig       |   11 +
 arch/powerpc/configs/ppc40x_defconfig            |  106 +++++++++++--
 arch/powerpc/configs/ppc44x_defconfig            |  125 ++++++++++++----
 arch/powerpc/include/asm/iommu.h                 |   15 +-
 arch/powerpc/include/asm/kdump.h                 |    8 -
 arch/powerpc/include/asm/mpic.h                  |    2 
 arch/powerpc/include/asm/pci.h                   |    2 
 arch/powerpc/kernel/dma-iommu.c                  |   34 ++--
 arch/powerpc/kernel/head_64.S                    |   30 ++--
 arch/powerpc/kernel/ibmebus.c                    |   27 ++-
 arch/powerpc/kernel/iommu.c                      |   25 ++-
 arch/powerpc/kernel/machine_kexec_64.c           |    9 -
 arch/powerpc/kernel/misc_64.S                    |    9 -
 arch/powerpc/kernel/of_device.c                  |    1 
 arch/powerpc/kernel/pci-common.c                 |  110 +++++++-------
 arch/powerpc/kernel/pci_64.c                     |    2 
 arch/powerpc/kernel/prom_init.c                  |   10 +
 arch/powerpc/kernel/setup_64.c                   |    6 -
 arch/powerpc/kernel/signal_32.c                  |   36 ++---
 arch/powerpc/kernel/signal_64.c                  |   33 ++--
 arch/powerpc/kernel/vio.c                        |   25 ++-
 arch/powerpc/kernel/vmlinux.lds.S                |    5 -
 arch/powerpc/oprofile/op_model_cell.c            |   13 +-
 arch/powerpc/platforms/40x/Kconfig               |    2 
 arch/powerpc/platforms/85xx/mpc85xx_ds.c         |    3 
 arch/powerpc/platforms/86xx/pic.c                |    3 
 arch/powerpc/platforms/cell/iommu.c              |   37 ++---
 arch/powerpc/platforms/cell/ras.c                |    6 -
 arch/powerpc/platforms/embedded6xx/linkstation.c |   14 ++
 arch/powerpc/platforms/iseries/iommu.c           |    7 +
 arch/powerpc/platforms/ps3/system-bus.c          |   36 ++---
 arch/powerpc/platforms/pseries/iommu.c           |    4 -
 arch/powerpc/platforms/pseries/pci_dlpar.c       |    2 
 arch/powerpc/sysdev/mpic.c                       |   59 +++++++
 arch/powerpc/xmon/xmon.c                         |    2 
 drivers/of/device.c                              |   11 +
 57 files changed, 1444 insertions(+), 865 deletions(-)

[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 fixes for various regressions, compile failures
and oops-causing bugs on powerpc, plus some defconfig updates (which
form the bulk of the lines changed).

The 3 commits from Milton Miller partially revert some changes we did
since 2.6.27 to the way the kernel is invoked and the way it invokes a
kexec/kdump kernel, and subsequently decided was a bad idea.  I put
them in so that we didn't end up having one kernel release with odd
interface conventions.

I'm sending this pull request rather than Ben because Ben's wife just
had a baby and Ben is otherwise occupied. :)

Thanks,
Paul.

 arch/powerpc/boot/dts/mpc8313erdb.dts            |   39 -------
 arch/powerpc/boot/libfdt/fdt_ro.c                |    9 +-
 arch/powerpc/boot/main.c                         |    2 
 arch/powerpc/configs/40x/acadia_defconfig        |   59 +++++++---
 arch/powerpc/configs/40x/ep405_defconfig         |   83 ++++++++++-----
 arch/powerpc/configs/40x/hcu4_defconfig          |  125 ++++++++++++++++------
 arch/powerpc/configs/40x/kilauea_defconfig       |   69 ++++++++----
 arch/powerpc/configs/40x/makalu_defconfig        |   69 ++++++++----
 arch/powerpc/configs/40x/walnut_defconfig        |   77 ++++++++++----
 arch/powerpc/configs/44x/arches_defconfig        |   51 ++++++---
 arch/powerpc/configs/44x/bamboo_defconfig        |   77 ++++++++++----
 arch/powerpc/configs/44x/canyonlands_defconfig   |   61 +++++++----
 arch/powerpc/configs/44x/ebony_defconfig         |   77 ++++++++++----
 arch/powerpc/configs/44x/katmai_defconfig        |   77 ++++++++++----
 arch/powerpc/configs/44x/rainier_defconfig       |   73 +++++++++----
 arch/powerpc/configs/44x/sam440ep_defconfig      |  110 ++++++++++++++-----
 arch/powerpc/configs/44x/sequoia_defconfig       |   78 ++++++++++----
 arch/powerpc/configs/44x/taishan_defconfig       |   77 ++++++++++----
 arch/powerpc/configs/44x/warp_defconfig          |   82 ++++++++++----
 arch/powerpc/configs/linkstation_defconfig       |   11 +-
 arch/powerpc/configs/ppc40x_defconfig            |  106 +++++++++++++++----
 arch/powerpc/configs/ppc44x_defconfig            |  125 +++++++++++++++++-----
 arch/powerpc/include/asm/iommu.h                 |   15 +--
 arch/powerpc/include/asm/kdump.h                 |    8 -
 arch/powerpc/include/asm/mpic.h                  |    2 
 arch/powerpc/include/asm/pci.h                   |    2 
 arch/powerpc/kernel/dma-iommu.c                  |   34 +++---
 arch/powerpc/kernel/head_64.S                    |   30 +++--
 arch/powerpc/kernel/ibmebus.c                    |   27 ++---
 arch/powerpc/kernel/iommu.c                      |   25 ++--
 arch/powerpc/kernel/machine_kexec_64.c           |    9 --
 arch/powerpc/kernel/misc_64.S                    |    9 +-
 arch/powerpc/kernel/of_device.c                  |    1 
 arch/powerpc/kernel/pci-common.c                 |  110 ++++++++++---------
 arch/powerpc/kernel/pci_64.c                     |    2 
 arch/powerpc/kernel/setup_64.c                   |    6 +
 arch/powerpc/kernel/signal_32.c                  |   36 +++---
 arch/powerpc/kernel/signal_64.c                  |   33 +++---
 arch/powerpc/kernel/vio.c                        |   25 ++--
 arch/powerpc/kernel/vmlinux.lds.S                |    2 
 arch/powerpc/oprofile/op_model_cell.c            |   13 ++
 arch/powerpc/platforms/40x/Kconfig               |    2 
 arch/powerpc/platforms/85xx/mpc85xx_ds.c         |    3 -
 arch/powerpc/platforms/86xx/pic.c                |    3 -
 arch/powerpc/platforms/cell/iommu.c              |   37 +++----
 arch/powerpc/platforms/cell/ras.c                |    6 +
 arch/powerpc/platforms/embedded6xx/linkstation.c |   14 ++
 arch/powerpc/platforms/iseries/iommu.c           |    7 +
 arch/powerpc/platforms/ps3/system-bus.c          |   36 +++---
 arch/powerpc/platforms/pseries/iommu.c           |    4 -
 arch/powerpc/platforms/pseries/pci_dlpar.c       |    2 
 arch/powerpc/sysdev/mpic.c                       |   59 ++++++++++
 arch/powerpc/xmon/xmon.c                         |    2 
 drivers/of/device.c                              |   11 ++
 54 files changed, 1392 insertions(+), 720 deletions(-)

Benjamin Herrenschmidt (1):
      powerpc/pci: Fix unmapping of IO space on 64-bit

Carl Love (1):
      powerpc/cell/OProfile: Fix on-stack array size in activate spu profiling function

David Gibson (1):
      powerpc: Fix bug in kernel copy of libfdt's fdt_subnode_offset_namelen()

Guennadi Liakhovetski (1):
      powerpc: fix i2c on PPC linkstation / kurobox machines

Jeremy Kerr (1):
      OF-device: Don't overwrite numa_node in device registration

Jon Smirl (1):
      powerpc: Fix format string warning in arch/powerpc/boot/main.c

Josh Boyer (3):
      powerpc/40x: Don't enable HCU4 board by default
      powerpc/40x: Update 40x defconfigs
      powerpc/44x: Update 44x defconfigs

Kumar Gala (1):
      powerpc/mpic: Fix regression caused by change of default IRQ affinity

Mark Nelson (1):
      powerpc: Update remaining dma_mapping_ops to use map/unmap_page

Michael Neuling (2):
      powerpc: Fix compiler warning for the relocatable kernel
      powerpc: Fix swapcontext system for VSX + old ucontext size

Mike Dyer (1):
      powerpc: Remove duplicate DMA entry from mpc8313erdb device tree

Milton Miller (3):
      powerpc: Kexec exit should not use magic numbers
      powerpc: Use is_kdump_kernel()
      powerpc/ppc64/kdump: Better flag for running relocatable

Nathan Fontenot (1):
      powerpc/pci: Properly allocate bus resources for hotplug PHBs

Paul Mackerras (2):
      powerpc: Work around ld bug in older binutils
      powerpc: Fix compile errors with CONFIG_BUG=n

Rogério Brito (2):
      powerpc: compile kernel for linkstations optimized for size
      powerpc: enable heap randomization for linkstations

[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

The main thing there is a patch from James Bottomley which fixes the
build failure on 64-bit powerpc with CONFIG_MODULES=n.

There are two other small commits that fix boot problems for embedded
boards: one that ensures that we build the right type of image for the
Holly evaluation board, and one that fixes some interrupt numbers on
Freescale MPC8610-based systems.

Thanks,
Paul.

 arch/powerpc/boot/Makefile             |    2 +-
 arch/powerpc/boot/dts/mpc8610_hpcd.dts |    8 ++++----
 arch/powerpc/include/asm/elf.h         |    7 +++++++
 arch/powerpc/include/asm/sections.h    |   12 +++++++++++-
 arch/powerpc/kernel/module_64.c        |   19 -------------------
 5 files changed, 23 insertions(+), 25 deletions(-)

commit 2d291e902791e1c8d72bc223b6f063bbb27a1280
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Tue Sep 9 14:04:18 2008 +0000

    Fix compile failure with non modular builds
    
    Commit deac93df26b20cf8438339b5935b5f5643bc30c9 ("lib: Correct printk
    %pF to work on all architectures") broke the non modular builds by
    moving an essential function into modules.c.  Fix this by moving it
    out again and into asm/sections.h as an inline.  To do this, the
    definition of struct ppc64_opd_entry has been lifted out of modules.c
    and put in asm/elf.h where it belongs.
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 32dde0f975e430f00f03f80f7dbab585d8b45eab
Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date:   Tue Sep 9 04:00:28 2008 +0000

    powerpc: Holly board needs dtbImage target
    
    One of the changes in the bootwrapper makefile introduced the dtbImage
    targets for boards that need a simple zImage with a DTB embedded in
    them (595be948cce574ff2d5dde5d0426a636a4363c70, "[POWERPC]
    bootwrapper: Build multiple cuImages").  When this was done, it broke
    booting on the Holly board as the zImage.holly wrapper did not get the
    DTB embedded properly.
    
    This changes the target for the Holly board to a dtbImage so that the
    wrapper includes the vmlinux, wrapper bits, and DTB.
    
    Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 612f9d338a6060f814ef35b7108b43407a5df423
Author: Timur Tabi <timur@freescale.com>
Date:   Tue Sep 9 14:43:39 2008 -0500

    powerpc: Fix interrupt values for DMA2 in MPC8610 HPCD device tree
    
    For Freescale 8xxx devices that use an MPIC, the interrupt numbers in
    the device tree must be 16 greater than the values documented in the
    reference manual.  In these chips, the MPIC is wired to use the first
    16 numbers for external interrupts, but the documentation numbers
    internal interrupts from 0.
    
    In the MPC8610 HPCD device tree, the interrupt properties for the DMA
    channels for DMA2 were not the adjusted values.  This fixes that.
    
    Signed-off-by: Timur Tabi <timur@freescale.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

[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

There is one commit there from Hugh Dickins that fixes a build
problem, plus three from the Cell guys fixing a couple of races and a
reference count leak in arch/powerpc/platforms/cell/spufs/sched.c.
The reference count leak is a regression from 2.6.26, and the races
can apparently lead to an unkillable process (looping in the kernel)
or to a panic.

Thanks,
Paul.

 arch/powerpc/boot/Makefile                |    2 +-
 arch/powerpc/platforms/cell/spufs/sched.c |   29 +++++++++++++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

commit 4ff23fa93011e2367fea056e72c92709178972d9
Author: Hugh Dickins <hugh@veritas.com>
Date:   Sun Sep 7 00:35:48 2008 +0100

    powerpc: Fix rare boot build breakage
    
    A make -j20 powerpc kernel build broke a couple of months ago saying:
    In file included from arch/powerpc/boot/gunzip_util.h:13,
                     from arch/powerpc/boot/prpmc2800.c:21:
    arch/powerpc/boot/zlib.h:85: error: expected ?:?, ?,?, ?;?, ?}? or ?__attribute__? before ?*? token
    arch/powerpc/boot/zlib.h:630: warning: type defaults to ?int? in declaration of ?Byte?
    arch/powerpc/boot/zlib.h:630: error: expected ?;?, ?,? or ?)? before ?*? token
    
    It happened again yesterday: too rare for me to confirm the fix, but
    it looks like the list of dependants on gunzip_util.h was incomplete.
    
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit b2e601d14deb2083e2a537b47869ab3895d23a28
Author: Andre Detsch <adetsch@br.ibm.com>
Date:   Thu Sep 4 21:16:27 2008 +0000

    powerpc/spufs: Fix possible scheduling of a context to multiple SPEs
    
    We currently have a race when scheduling a context to a SPE -
    after we have found a runnable context in spusched_tick, the same
    context may have been scheduled by spu_activate().
    
    This may result in a panic if we try to unschedule a context that has
    been freed in the meantime.
    
    This change exits spu_schedule() if the context has already been
    scheduled, so we don't end up scheduling it twice.
    
    Signed-off-by: Andre Detsch <adetsch@br.ibm.com>
    Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

commit b65fe0356b5b732d7e1e0224c6a1cf2eb5255984
Author: Jeremy Kerr <jk@ozlabs.org>
Date:   Thu Sep 4 15:02:47 2008 +1000

    powerpc/spufs: Fix race for a free SPU
    
    We currently have a race for a free SPE. With one thread doing a
    spu_yield(), and another doing a spu_activate():
    
    thread 1				thread 2
    spu_yield(oldctx)			spu_activate(ctx)
      __spu_deactivate(oldctx)
      spu_unschedule(oldctx, spu)
      spu->alloc_state = SPU_FREE
    					spu = spu_get_idle(ctx)
    					    - searches for a SPE in
    					      state SPU_FREE, gets
    					      the context just
    					      freed by thread 1
    					spu_schedule(ctx, spu)
    					  spu->alloc_state = SPU_USED
    spu_schedule(newctx, spu)
      - assumes spu is still free
      - tries to schedule context on
        already-used spu
    
    This change introduces a 'free_spu' flag to spu_unschedule, to indicate
    whether or not the function should free the spu after descheduling the
    context. We only set this flag if we're not going to re-schedule
    another context on this SPU.
    
    Add a comment to document this behaviour.
    
    Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

commit 9f43e3914dceb0f8191875b3cdf4325b48d0d70a
Author: Jeremy Kerr <jk@ozlabs.org>
Date:   Tue Sep 2 11:57:09 2008 +1000

    powerpc/spufs: Fix multiple get_spu_context()
    
    Commit 8d5636fbca202f61fdb808fc9e20c0142291d802 introduced a reference
    count on SPU contexts during find_victim, but this may cause a leak in
    the reference count if we later find a better contender for a context to
    unschedule.
    
    Change the reference to after we've found our victim context, so we
    don't do the extra get_spu_context().
    
    Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

[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 6 commits that fix various regressions, build problems and
serious bugs on powerpc.  I have included the full commit messages
below.

Thanks,
Paul.

 arch/powerpc/Makefile                    |    5 +++++
 arch/powerpc/include/asm/pgtable-ppc64.h |    6 ++----
 arch/powerpc/kernel/Makefile             |    7 ++++---
 arch/powerpc/kernel/align.c              |    2 +-
 arch/powerpc/kernel/idle_6xx.S           |    2 +-
 arch/powerpc/kernel/idle_e500.S          |    3 ++-
 arch/powerpc/kernel/vmlinux.lds.S        |    7 ++++---
 arch/powerpc/mm/hash_utils_64.c          |   18 +++++++++++-------
 arch/powerpc/platforms/powermac/Makefile |    2 +-
 lib/Kconfig.debug                        |    6 +++---
 10 files changed, 34 insertions(+), 24 deletions(-)

commit 7888bc2b4778fda267a6e6422c4497dba865a47a
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Tue Aug 26 12:08:56 2008 +1000

    powerpc: Fix for getting CPU number in power_save_ppc32_restore()
    
    The calculation to get TI_CPU based off of SPRG3 was just plain wrong,
    meaning that we were getting garbage for the CPU number on 6xx/G3/G4
    based SMP boxes in this code.
    
    Just offset off the stack pointer (to get to thread_info) like all the
    other references to TI_CPU do.
    
    This was pointed out by Chen Gong <G.Chen@freescale.com>
    
    [paulus@samba.org - use rlwinm r12,r11,... instead of
     rlwinm r12,r1,...; tophys()]
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 94ee815c05c9387931e549d83312d30009ed86e9
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Wed Sep 3 13:12:05 2008 +1000

    powerpc: Fix build error with 64K pages and !hugetlbfs
    
    HAVE_ARCH_UNMAPPED_AREA and HAVE_ARCH_UNMAPPED_AREA_TOPDOWN must
    be defined whenever CONFIG_PPC_MM_SLICES is enabled, not just when
    CONFIG_HUGETLB_PAGE is.  They used to be always defined together but
    this is no longer the case since 3a8247cc2c856930f34eafce33f6a039227ee175
    ("powerpc: Only demote individual slices rather than whole process").
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 7563dc64585324f443f5ac107eb6d89ee813a2d2
Author: Tony Breeds <tony@bakeyournoodle.com>
Date:   Tue Sep 2 16:50:38 2008 +1000

    powerpc: Work around gcc's -fno-omit-frame-pointer bug
    
    This bug is causing random crashes
    (http://bugzilla.kernel.org/show_bug.cgi?id=11414).
    
    -fno-omit-frame-pointer is only needed on powerpc when -pg is also
    supplied, and there is a gcc bug that causes incorrect code generation
    on 32-bit powerpc when -fno-omit-frame-pointer is used---it uses stack
    locations below the stack pointer, which is not allowed by the ABI
    because those locations can and sometimes do get corrupted by an
    interrupt.
    
    This ensures that CONFIG_FRAME_POINTER is only selected by ftrace.
    When CONFIG_FTRACE is enabled we also pass -mno-sched-epilog to work
    around the gcc codegen bug.
    
    Patch based on work by:
    	Andreas Schwab <schwab@suse.de>
    	Segher Boessenkool <segher@kernel.crashing.org>
    
    Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 303996dace16894710a5291327eeb79afdb8ed12
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Tue Sep 2 15:04:09 2008 +1000

    powerpc: Make sure _etext is after all kernel text
    
    This makes core_kernel_text() (and therefore kernel_text_address())
    return the correct result.  Currently all the __devinit routines (at
    least) will not be considered to be kernel text.
    
    This is just a quick fix for 2.6.27 - hopefully we will be able to fix
    this better in 2.6.28.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 9e88ba4e45ecad2425c4cc4e0861a26f4e36c6da
Author: Paul Mackerras <paulus@samba.org>
Date:   Sat Aug 30 11:26:27 2008 +1000

    powerpc: Only make kernel text pages of linear mapping executable
    
    Commit bc033b63bbfeb6c4b4eb0a1d083c650e4a0d2af8 ("powerpc/mm: Fix
    attribute confusion with htab_bolt_mapping()") moved the check for
    whether we should make pages of the linear mapping executable from
    htab_bolt_mapping into its callers, including htab_initialize.
    A side-effect of this is that the decision is now made once for
    each contiguous section in the LMB array rather than for each page
    individually.  This can often mean that the whole of the linear
    mapping ends up being executable.
    
    This reverts to the previous behaviour, where individual pages are
    checked for being part of the kernel text or not, by moving the check
    back down into htab_bolt_mapping.
    
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 78fbc824ed8225edd80cdc57771d5ca4f7aae95e
Author: Michael Neuling <mikey@neuling.org>
Date:   Thu Aug 28 14:57:39 2008 +1000

    powerpc: Fix uninitialised variable in VSX alignment code
    
    This fixes an uninitialised variable in the VSX alignment code.  It can
    cause warnings from GCC (noticed with gcc-4.1.1).  Gcc is actually
    correct in this instance, and this bug could cause the alignment
    interrupt handler to send a SIGSEGV to the process on a legitimate
    access.
    
    Signed-off-by: Michael Neuling <mikey@neuling.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

[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 bug-fixes and defconfig updates for powerpc.  Almost
all of the lines changed are in the defconfigs.  The rest of the
changes are fixes for various regressions, build failures, and a
possible oops, plus two commits that fix memory leaks and race
conditions in code that is only used on embedded systems with
Freescale processors.


Thanks,
Paul.

 arch/powerpc/boot/dts/mpc8641_hpcn.dts            |    2 
 arch/powerpc/boot/dts/tqm8548-bigflash.dts        |    8 
 arch/powerpc/boot/dts/tqm8548.dts                 |    3 
 arch/powerpc/boot/wrapper                         |    2 
 arch/powerpc/configs/83xx/asp8347_defconfig       |  312 ++++++++++++-----
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   |  188 ++++++++--
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   |  188 ++++++++--
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   |  172 +++++++--
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   |  176 +++++++---
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   |  175 +++++++--
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig |  172 +++++++--
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   |  168 +++++++--
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   |  172 +++++++--
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   |  183 +++++++---
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   |  351 +++++++++++++++++--
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   |  340 ++++++++++++++++--
 arch/powerpc/configs/83xx/sbc834x_defconfig       |  239 +++++++++++--
 arch/powerpc/configs/85xx/ksi8560_defconfig       |   95 ++++-
 arch/powerpc/configs/85xx/mpc8536_ds_defconfig    |  167 +++++----
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   |   71 +++-
 arch/powerpc/configs/85xx/mpc8544_ds_defconfig    |  178 ++++++----
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   |   98 ++++-
 arch/powerpc/configs/85xx/mpc8568mds_defconfig    |  121 +++++--
 arch/powerpc/configs/85xx/mpc8572_ds_defconfig    |  177 ++++++----
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   |   85 +++--
 arch/powerpc/configs/85xx/sbc8548_defconfig       |   63 ++-
 arch/powerpc/configs/85xx/sbc8560_defconfig       |   69 +++-
 arch/powerpc/configs/85xx/stx_gp3_defconfig       |  163 ++++++---
 arch/powerpc/configs/85xx/tqm8540_defconfig       |  112 ++++--
 arch/powerpc/configs/85xx/tqm8541_defconfig       |  139 ++++++--
 arch/powerpc/configs/85xx/tqm8548_defconfig       |  129 +++++--
 arch/powerpc/configs/85xx/tqm8555_defconfig       |  139 ++++++--
 arch/powerpc/configs/85xx/tqm8560_defconfig       |  139 ++++++--
 arch/powerpc/configs/adder875_defconfig           |   55 ++-
 arch/powerpc/configs/c2k_defconfig                |  245 ++++++-------
 arch/powerpc/configs/chrp32_defconfig             |  141 +++++---
 arch/powerpc/configs/ep8248e_defconfig            |  198 +++++++++--
 arch/powerpc/configs/ep88xc_defconfig             |   57 ++-
 arch/powerpc/configs/g5_defconfig                 |  227 +++++++-----
 arch/powerpc/configs/iseries_defconfig            |   87 +++--
 arch/powerpc/configs/linkstation_defconfig        |  133 +++++--
 arch/powerpc/configs/maple_defconfig              |  381 ++++++++++++++-------
 arch/powerpc/configs/mpc7448_hpc2_defconfig       |   72 +++-
 arch/powerpc/configs/mpc8272_ads_defconfig        |  132 +++++--
 arch/powerpc/configs/mpc83xx_defconfig            |  389 +++++++++++++++++++--
 arch/powerpc/configs/mpc85xx_defconfig            |  207 +++++++----
 arch/powerpc/configs/mpc8610_hpcd_defconfig       |  165 +++++----
 arch/powerpc/configs/mpc8641_hpcn_defconfig       |  215 +++++++-----
 arch/powerpc/configs/mpc866_ads_defconfig         |   61 ++-
 arch/powerpc/configs/mpc885_ads_defconfig         |   57 ++-
 arch/powerpc/configs/pmac32_defconfig             |  241 +++++++------
 arch/powerpc/configs/ppc64_defconfig              |  237 +++++++------
 arch/powerpc/configs/ppc6xx_defconfig             |  144 ++++----
 arch/powerpc/configs/pq2fads_defconfig            |  147 ++++++--
 arch/powerpc/configs/prpmc2800_defconfig          |  125 +++++--
 arch/powerpc/configs/ps3_defconfig                |  153 +++++++-
 arch/powerpc/configs/pseries_defconfig            |  172 +++++++--
 arch/powerpc/configs/sbc8641d_defconfig           |  173 +++++++--
 arch/powerpc/configs/storcenter_defconfig         |  113 ++++--
 arch/powerpc/platforms/ps3/htab.c                 |  269 +++++----------
 arch/powerpc/platforms/ps3/setup.c                |    1 
 arch/powerpc/platforms/ps3/spu.c                  |   18 +
 arch/powerpc/platforms/pseries/setup.c            |    1 
 arch/powerpc/sysdev/cpm_common.c                  |   37 +-
 arch/powerpc/sysdev/qe_lib/ucc_fast.c             |    4 
 arch/powerpc/sysdev/qe_lib/ucc_slow.c             |    8 
 drivers/oprofile/cpu_buffer.c                     |    4 
 drivers/oprofile/event_buffer.c                   |    2 
 68 files changed, 6659 insertions(+), 2808 deletions(-)
 rename arch/powerpc/configs/{asp8347_defconfig => 83xx/asp8347_defconfig} (87%)
 rename arch/powerpc/configs/{mpc8536_ds_defconfig => 85xx/mpc8536_ds_defconfig} (95%)

commit 9bdbb9633281b58ff483ede723f8c4a6344cab2f
Author: Paul Mackerras <paulus@samba.org>
Date:   Tue Aug 26 13:31:55 2008 +1000

    powerpc: Update defconfigs for most non-embedded platforms
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit d617a40227705eb0d7b7692bbb974d077f0219a9
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Thu Aug 21 11:16:26 2008 +1000

    powerpc: Export CMO_PageSize
    
    This fixes an error building powerpc allmodconfig:
    
    ERROR: "CMO_PageSize" [arch/powerpc/platforms/pseries/cmm.ko] undefined!
    
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit b47027795a22fe61f93de6010c120f26273fc693
Author: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Date:   Thu Aug 21 06:18:56 2008 +1000

    powerpc/ps3: Fix ioremap of spu shadow regs
    
    Fix the ioremap of the spu shadow regs on the PS3.
    
    The current PS3 hypervisor requires the spu shadow regs to be
    mapped with the PTE page protection bits set as read-only (PP=3).
    This implementation uses the low level __ioremap() to bypass the
    page protection settings inforced by ioremap_flags() to get the
    needed PTE bits set for the shadow regs.
    
    This fixes a runtime failure on the PS3 introduced by the powerpc
    ioremap_prot rework of commit a1f242ff460e4b50a045fa237c3c56cce9eabf83
    ("powerpc ioremap_prot").
    
    Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
    CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 9cfeb74e93cf3549b7fa67ffe407192da625c777
Author: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Date:   Thu Aug 21 06:18:51 2008 +1000

    powerpc/ps3: Rework htab code to remove ioremap
    
    Rework the PS3 MMU hash table code to remove the need to ioremap the
    hash table by using the HV calls lv1_insert_htab_entry() and
    lv1_read_htab_entries().
    
    This fixes a runtime failure on the PS3 introduced by the powerpc
    ioremap_prot rework of commit a1f242ff460e4b50a045fa237c3c56cce9eabf83
    ("powerpc ioremap_prot").
    
    Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
    CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 98fded0728d6d65b78a7fe7d205e947ee81bb9b5
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date:   Thu Aug 21 06:18:43 2008 +1000

    powerpc/ps3: Update ps3_defconfig
    
    Update ps3_defconfig.
    
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit f4156d1cd1dc260cca767a6c0636625f05446799
Author: Carl Love <cel@us.ibm.com>
Date:   Mon Aug 11 17:25:43 2008 +1000

    powerpc/cell/oprofile: Avoid double vfree of profile buffer
    
    If an error occurs on opcontrol start, the event and per cpu buffers
    are released.  If later opcontrol shutdown is called then the free
    function will be called again to free buffers that no longer
    exist.  This results in a kernel oops.  The following changes
    prevent the call to delete buffers that don't exist.
    
    Signed-off-by: Carl Love <carll@us.ibm.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Acked-by: Robert Richter <robert.richter@amd.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 2bb2e1db906e6e139636271d2cf46466d9e84005
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Thu Aug 21 07:11:30 2008 -0500

    powerpc: Update defconfigs for FSL PPC boards
    
    Since we are updated defconfigs I went ahead and moved the
    asp8347_defconfig under 83xx/ and the mpc8536_ds_defconfig under
    85xx/ as that is where they should have been to start with.
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 8dd217b27e32081121c31d927e7c70f6dbf6f5c6
Author: Scott Wood <scottwood@freescale.com>
Date:   Thu Jul 31 19:10:22 2008 +0300

    powerpc: Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
    
    This patch fixes the following build error with mpc866_ads_defconfig:
    
    <--  snip  -->
    
    ...
      WRAP    arch/powerpc/boot/cuImage.mpc866ads
    powerpc64-linux-ld: arch/powerpc/boot/cuboot-mpc866ads.o: No such file: No such file or directory
    make[2]: *** [arch/powerpc/boot/cuImage.mpc866ads] Error 1
    
    <--  snip  -->
    
    Reported-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Scott Wood <scottwood@freescale.com>
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 639d64456e20cbfc866b18dc03cf9f9babc9c7cd
Author: Laurent Pinchart <laurentp@cse-semaphore.com>
Date:   Tue Aug 19 14:20:23 2008 +0200

    cpm2: Fix race condition in CPM2 GPIO library.
    
    The CPM2 GPIO library code uses the non thread-safe clrbits32/setbits32
    macros. This patch protects them with a spinlock.
    
    Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 61a4e9e91dd3916ef91aa4899b7271bba0248677
Author: Timur Tabi <timur@freescale.com>
Date:   Wed Aug 20 10:29:09 2008 -0500

    powerpc: fix memory leaks in QE library
    
    Fix two memory leaks in the Freescale QE library: add a missing kfree() in
    ucc_fast_init() and ucc_slow_init() if the ioremap() fails, and update
    ucc_fast_free() and ucc_slow_free() to call iounmap() if necessary.
    
    Based on a patch from Tony Breeds <tony@bakeyournoodle.com>.
    
    Signed-off-by: Timur Tabi <timur@freescale.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit d27a736c7a62c3451e389aa8e0dfc64dab119b9b
Author: Wolfgang Grandegger <wg@grandegger.com>
Date:   Sun Aug 17 10:51:25 2008 +0200

    powerpc/85xx: TQM8548: DTS file fixes and cleanup
    
    Due to the missing compatible property for the SOC, the MPC I2C buses are
    not found any more. This patch fixes this issue. Furthermore it corrects
    the name of the SOC node and adds the missing I2C node for the RTC.
    
    Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit ba1616d921429ffe7480e8835e85f95ff041add8
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Thu Jul 31 17:06:31 2008 -0500

    powerpc: Fix whitespace merge in mpc8641 hpcn device tree
    
    When we coverted the .dts to v1 we lost a space between the irq
    and its polarity/sense information.  This causes a bit of chaos
    as the reset of the blob is off by one cell.
    
    This was noticed by booting and getting errors w/ATA due to
    lock of interrupts.
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

[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 bug-fixes for powerpc.

Paul.

 arch/powerpc/kernel/crash_dump.c          |   31 +++++++++++++++++++++--------
 arch/powerpc/kernel/ibmebus.c             |   12 -----------
 arch/powerpc/kernel/vio.c                 |    2 +-
 arch/powerpc/platforms/cell/spufs/run.c   |   15 +++++++-------
 arch/powerpc/platforms/cell/spufs/sched.c |   11 ++++++++--
 drivers/of/device.c                       |   10 +++++++++
 6 files changed, 50 insertions(+), 31 deletions(-)

Brian King (1):
      powerpc: Fix vio_bus_probe oops on probe error

Ilpo Järvinen (1):
      powerpc/spufs: Remove invalid semicolon after if statement

Jeremy Kerr (2):
      powerpc/spufs: fix npc setting for NOSCHED contexts
      powerpc/spufs: reference context while dropping state mutex in scheduler

Joachim Fenkes (1):
      powerpc/ibmebus: Restore "name" sysfs attribute on ibmebus devices

Michael Ellerman (1):
      powerpc: Fix /dev/oldmem interface for kdump

[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 fixes for various bugs on powerpc, as listed below.

Thanks,
Paul.

 arch/powerpc/include/asm/hvcall.h               |   22 +++++++++
 arch/powerpc/include/asm/irqflags.h             |    5 +-
 arch/powerpc/include/asm/mmu_context.h          |    1 
 arch/powerpc/include/asm/systbl.h               |    2 -
 arch/powerpc/kernel/head_32.S                   |    2 -
 arch/powerpc/kernel/lparcfg.c                   |    5 ++
 arch/powerpc/kernel/misc_32.S                   |    2 -
 arch/powerpc/kernel/module.c                    |   15 ------
 arch/powerpc/kernel/sys_ppc32.c                 |   57 -----------------------
 arch/powerpc/platforms/pseries/plpar_wrappers.h |   27 ++++++++++-
 arch/powerpc/platforms/pseries/setup.c          |   28 ++++++++---
 11 files changed, 78 insertions(+), 88 deletions(-)

Benjamin Herrenschmidt (2):
      powerpc: Fix loss of vdso on fork on 32-bit
      powerpc: Fix lockdep IRQ tracing bug

Brian King (1):
      powerpc: Fix CMM page loaning on 64k page kernel with 4k hardware pages

Christoph Hellwig (1):
      powerpc: Use generic compat_sys_old_readdir

Paul Collins (1):
      powerpc/kexec: Fix up KEXEC_CONTROL_CODE_SIZE missed during conversion

Robert Jennings (2):
      powerpc: Make CMO paging space pool ID and page size available
      powerpc: Add CMO enabled flag and paging space data to lparcfg

Rocky Craig (1):
      powerpc: Fix TLB invalidation on boot on 32-bit

Steven Rostedt (1):
      powerpc: Remove dead module_find_bug code

[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

There are some assorted powerpc bugfixes and defconfig updates, plus a
patch to Documentation/feature-removal-schedule.txt from Robert
P. J. Day that removes the section on removing arch/ppc, since that is
done, plus one from me removing include/linux/harrier_defs.h, since it
was only used by code in arch/ppc which is now gone.

Thanks,
Paul.

 Documentation/feature-removal-schedule.txt     |   13 -
 arch/powerpc/boot/dts/warp.dts                 |   22 +
 arch/powerpc/configs/40x/ep405_defconfig       |  207 +++++++++----
 arch/powerpc/configs/40x/kilauea_defconfig     |  196 +++++++++----
 arch/powerpc/configs/40x/makalu_defconfig      |  196 +++++++++----
 arch/powerpc/configs/40x/walnut_defconfig      |  203 +++++++++----
 arch/powerpc/configs/44x/bamboo_defconfig      |  206 +++++++++----
 arch/powerpc/configs/44x/canyonlands_defconfig |  116 +++++--
 arch/powerpc/configs/44x/ebony_defconfig       |  207 +++++++++----
 arch/powerpc/configs/44x/katmai_defconfig      |  259 ++++++++++++-----
 arch/powerpc/configs/44x/rainier_defconfig     |  207 +++++++++----
 arch/powerpc/configs/44x/sam440ep_defconfig    |  109 +++++--
 arch/powerpc/configs/44x/sequoia_defconfig     |  207 +++++++++----
 arch/powerpc/configs/44x/taishan_defconfig     |  208 +++++++++----
 arch/powerpc/configs/44x/virtex5_defconfig     |  100 +++++-
 arch/powerpc/configs/44x/warp_defconfig        |  232 ++++++++++-----
 arch/powerpc/configs/ppc40x_defconfig          |  374 ++++++++++++++++++++----
 arch/powerpc/configs/ppc44x_defconfig          |  375 ++++++++++++++++++++++--
 arch/powerpc/include/asm/mmu-hash64.h          |    2 
 arch/powerpc/kernel/pci-common.c               |   17 +
 arch/powerpc/kernel/rtas.c                     |    5 
 arch/powerpc/mm/hash_utils_64.c                |   63 ++--
 arch/powerpc/mm/init_64.c                      |    9 -
 arch/powerpc/platforms/44x/warp-nand.c         |    2 
 arch/powerpc/platforms/44x/warp.c              |   25 +-
 include/linux/harrier_defs.h                   |  212 --------------
 26 files changed, 2598 insertions(+), 1174 deletions(-)
 delete mode 100644 include/linux/harrier_defs.h

Benjamin Herrenschmidt (2):
      powerpc/pci: Don't keep ISA memory hole resources in the tree
      powerpc/mm: Fix attribute confusion with htab_bolt_mapping()

Josh Boyer (1):
      powerpc/4xx: Update defconfig files for 2.6.27-rc1

Junio C Hamano (1):
      powerpc: Do not ignore arch/powerpc/include

Nathan Fontenot (1):
      powerpc: Zero fill the return values of rtas argument buffer

Paul Mackerras (1):
      powerpc: Remove include/linux/harrier_defs.h

Robert P. J. Day (1):
      powerpc: Delete completed "ppc removal" task from feature removal file

Sean MacLennan (3):
      powerpc/4xx: Cleanup Warp for i2c driver changes.
      powerpc/44x: Warp DTS changes for board updates
      powerpc/44x: Incorrect NOR offset in Warp DTS

Valentine Barshak (1):
      powerpc/44x: Adjust warp-nand resource end 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

The main thing there is that we have moved the powerpc include files
from include/asm-powerpc to arch/powerpc/include/asm.  There is also a
commit from Kumar Gala that removes code that was only referenced when
compiling with ARCH=ppc, and is now dead since arch/ppc is gone, plus
a couple of warning fixes from Tony Breeds.

(Note that the stuff in arch/powerpc/include/asm/irq.h all came from
include/asm-powerpc/irq.h; there was enough stuff removed by Kumar's
patch that the git rename detection logic didn't see it as a rename.)

Thanks,
Paul.

 Documentation/powerpc/booting-without-of.txt       |    4 +-
 Documentation/powerpc/eeh-pci-error-recovery.txt   |    2 +-
 arch/powerpc/Kconfig.debug                         |    2 +-
 arch/powerpc/boot/io.h                             |    2 +-
 .../powerpc/include/asm}/8253pit.h                 |    0 
 .../powerpc/include/asm}/8xx_immap.h               |    0 
 .../powerpc/include/asm}/Kbuild                    |    0 
 .../powerpc/include/asm}/a.out.h                   |    0 
 .../powerpc/include/asm}/abs_addr.h                |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/agp.h |    0 
 .../powerpc/include/asm}/asm-compat.h              |    0 
 .../powerpc/include/asm}/atomic.h                  |    0 
 .../powerpc/include/asm}/auxvec.h                  |    0 
 .../powerpc/include/asm}/backlight.h               |    0 
 .../powerpc/include/asm}/bitops.h                  |    0 
 .../powerpc/include/asm}/bootx.h                   |    0 
 .../powerpc/include/asm}/btext.h                   |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/bug.h |    0 
 .../powerpc/include/asm}/bugs.h                    |    0 
 .../powerpc/include/asm}/byteorder.h               |    0 
 .../powerpc/include/asm}/cache.h                   |    0 
 .../powerpc/include/asm}/cacheflush.h              |    0 
 .../powerpc/include/asm}/cell-pmu.h                |    0 
 .../powerpc/include/asm}/cell-regs.h               |    0 
 .../powerpc/include/asm}/checksum.h                |    0 
 .../powerpc/include/asm}/clk_interface.h           |    0 
 .../powerpc/include/asm}/code-patching.h           |    0 
 .../powerpc/include/asm}/compat.h                  |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/cpm.h |    0 
 .../powerpc/include/asm}/cpm1.h                    |    0 
 .../powerpc/include/asm}/cpm2.h                    |    0 
 .../powerpc/include/asm}/cputable.h                |    0 
 .../powerpc/include/asm}/cputhreads.h              |    0 
 .../powerpc/include/asm}/cputime.h                 |    0 
 .../powerpc/include/asm}/current.h                 |    0 
 .../powerpc/include/asm}/dbdma.h                   |    0 
 .../powerpc/include/asm}/dcr-generic.h             |    0 
 .../powerpc/include/asm}/dcr-mmio.h                |    0 
 .../powerpc/include/asm}/dcr-native.h              |    0 
 .../powerpc/include/asm}/dcr-regs.h                |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/dcr.h |    6 +-
 .../powerpc/include/asm}/delay.h                   |    0 
 .../powerpc/include/asm}/device.h                  |    0 
 .../powerpc/include/asm}/div64.h                   |    0 
 .../powerpc/include/asm}/dma-mapping.h             |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/dma.h |    0 
 .../powerpc/include/asm}/edac.h                    |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/eeh.h |    0 
 .../powerpc/include/asm}/eeh_event.h               |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/elf.h |    0 
 .../powerpc/include/asm}/emergency-restart.h       |    0 
 .../powerpc/include/asm}/errno.h                   |    0 
 .../powerpc/include/asm}/exception.h               |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/fb.h  |    0 
 .../powerpc/include/asm}/fcntl.h                   |    0 
 .../powerpc/include/asm}/feature-fixups.h          |    0 
 .../powerpc/include/asm}/firmware.h                |    0 
 .../powerpc/include/asm}/fixmap.h                  |    0 
 .../powerpc/include/asm}/floppy.h                  |    0 
 .../powerpc/include/asm}/fs_pd.h                   |    0 
 .../powerpc/include/asm}/fsl_gtm.h                 |    0 
 .../powerpc/include/asm}/fsl_lbc.h                 |    0 
 .../powerpc/include/asm}/ftrace.h                  |    0 
 .../powerpc/include/asm}/futex.h                   |    0 
 .../powerpc/include/asm}/gpio.h                    |    0 
 .../powerpc/include/asm}/grackle.h                 |    0 
 .../powerpc/include/asm}/hardirq.h                 |    0 
 .../powerpc/include/asm}/heathrow.h                |    0 
 .../powerpc/include/asm}/highmem.h                 |    0 
 .../powerpc/include/asm}/hugetlb.h                 |    0 
 .../powerpc/include/asm}/hvcall.h                  |    0 
 .../powerpc/include/asm}/hvconsole.h               |    0 
 .../powerpc/include/asm}/hvcserver.h               |    0 
 .../powerpc/include/asm}/hw_irq.h                  |    0 
 .../powerpc/include/asm}/hydra.h                   |    0 
 .../powerpc/include/asm}/i8259.h                   |    5 -
 .../powerpc/include/asm}/ibmebus.h                 |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/ide.h |    0 
 .../powerpc/include/asm}/immap_86xx.h              |    0 
 .../powerpc/include/asm}/immap_cpm2.h              |    0 
 .../powerpc/include/asm}/immap_qe.h                |    2 -
 .../powerpc/include/asm}/io-defs.h                 |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/io.h  |    0 
 .../powerpc/include/asm}/ioctl.h                   |    0 
 .../powerpc/include/asm}/ioctls.h                  |    0 
 .../powerpc/include/asm}/iommu.h                   |    0 
 .../powerpc/include/asm}/ipcbuf.h                  |    0 
 .../powerpc/include/asm}/ipic.h                    |    9 -
 arch/powerpc/include/asm/irq.h                     |  366 +++++++++++
 .../powerpc/include/asm}/irq_regs.h                |    0 
 .../powerpc/include/asm}/irqflags.h                |    4 +-
 .../powerpc/include/asm}/iseries/alpaca.h          |    0 
 .../powerpc/include/asm}/iseries/hv_call.h         |    0 
 .../powerpc/include/asm}/iseries/hv_call_event.h   |    0 
 .../powerpc/include/asm}/iseries/hv_call_sc.h      |    0 
 .../powerpc/include/asm}/iseries/hv_call_xm.h      |    0 
 .../powerpc/include/asm}/iseries/hv_lp_config.h    |    0 
 .../powerpc/include/asm}/iseries/hv_lp_event.h     |    0 
 .../powerpc/include/asm}/iseries/hv_types.h        |    0 
 .../powerpc/include/asm}/iseries/iommu.h           |    0 
 .../powerpc/include/asm}/iseries/it_lp_queue.h     |    0 
 .../powerpc/include/asm}/iseries/lpar_map.h        |    0 
 .../powerpc/include/asm}/iseries/mf.h              |    0 
 .../powerpc/include/asm}/iseries/vio.h             |    0 
 .../powerpc/include/asm}/kdebug.h                  |    0 
 .../powerpc/include/asm}/kdump.h                   |    0 
 .../powerpc/include/asm}/kexec.h                   |    0 
 .../powerpc/include/asm}/keylargo.h                |    0 
 .../powerpc/include/asm}/kgdb.h                    |    2 -
 .../powerpc/include/asm}/kmap_types.h              |    0 
 .../powerpc/include/asm}/kprobes.h                 |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/kvm.h |    0 
 .../powerpc/include/asm}/kvm_asm.h                 |    0 
 .../powerpc/include/asm}/kvm_host.h                |    0 
 .../powerpc/include/asm}/kvm_para.h                |    0 
 .../powerpc/include/asm}/kvm_ppc.h                 |    0 
 .../powerpc/include/asm}/libata-portmap.h          |    0 
 .../powerpc/include/asm}/linkage.h                 |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/lmb.h |    0 
 .../powerpc/include/asm}/local.h                   |    0 
 .../powerpc/include/asm}/lppaca.h                  |    0 
 .../powerpc/include/asm}/lv1call.h                 |    0 
 .../powerpc/include/asm}/machdep.h                 |    0 
 .../powerpc/include/asm}/macio.h                   |    0 
 .../powerpc/include/asm}/mc146818rtc.h             |    0 
 .../powerpc/include/asm}/mediabay.h                |    0 
 .../powerpc/include/asm}/mman.h                    |    0 
 .../powerpc/include/asm}/mmu-40x.h                 |    0 
 .../powerpc/include/asm}/mmu-44x.h                 |    0 
 .../powerpc/include/asm}/mmu-8xx.h                 |    0 
 .../powerpc/include/asm}/mmu-fsl-booke.h           |    0 
 .../powerpc/include/asm}/mmu-hash32.h              |    0 
 .../powerpc/include/asm}/mmu-hash64.h              |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/mmu.h |    0 
 .../powerpc/include/asm}/mmu_context.h             |    0 
 .../powerpc/include/asm}/mmzone.h                  |    0 
 .../powerpc/include/asm}/module.h                  |    0 
 .../powerpc/include/asm}/mpc512x.h                 |    0 
 .../powerpc/include/asm}/mpc52xx.h                 |    0 
 .../powerpc/include/asm}/mpc52xx_psc.h             |    0 
 .../powerpc/include/asm}/mpc6xx.h                  |    0 
 .../powerpc/include/asm}/mpc8260.h                 |    0 
 .../powerpc/include/asm}/mpc86xx.h                 |    0 
 .../powerpc/include/asm}/mpc8xx.h                  |    0 
 .../powerpc/include/asm}/mpic.h                    |    0 
 .../powerpc/include/asm}/msgbuf.h                  |    0 
 .../powerpc/include/asm}/mutex.h                   |    0 
 .../powerpc/include/asm}/nvram.h                   |    0 
 .../powerpc/include/asm}/of_device.h               |    0 
 .../powerpc/include/asm}/of_platform.h             |    0 
 .../powerpc/include/asm}/ohare.h                   |    0 
 .../powerpc/include/asm}/oprofile_impl.h           |    0 
 .../powerpc/include/asm}/pSeries_reconfig.h        |    0 
 .../powerpc/include/asm}/paca.h                    |    2 -
 .../powerpc/include/asm}/page.h                    |    0 
 .../powerpc/include/asm}/page_32.h                 |    0 
 .../powerpc/include/asm}/page_64.h                 |    0 
 .../powerpc/include/asm}/param.h                   |    0 
 .../powerpc/include/asm}/parport.h                 |    0 
 .../powerpc/include/asm}/pasemi_dma.h              |    0 
 .../powerpc/include/asm}/pci-bridge.h              |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/pci.h |    0 
 .../powerpc/include/asm}/percpu.h                  |    0 
 .../powerpc/include/asm}/pgalloc-32.h              |    0 
 .../powerpc/include/asm}/pgalloc-64.h              |    0 
 .../powerpc/include/asm}/pgalloc.h                 |    0 
 .../powerpc/include/asm}/pgtable-4k.h              |    0 
 .../powerpc/include/asm}/pgtable-64k.h             |    0 
 .../powerpc/include/asm}/pgtable-ppc32.h           |    0 
 .../powerpc/include/asm}/pgtable-ppc64.h           |    2 +-
 .../powerpc/include/asm}/pgtable.h                 |    0 
 .../powerpc/include/asm}/phyp_dump.h               |    0 
 .../powerpc/include/asm}/pmac_feature.h            |    0 
 .../powerpc/include/asm}/pmac_low_i2c.h            |    0 
 .../powerpc/include/asm}/pmac_pfunc.h              |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/pmc.h |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/pmi.h |    0 
 .../powerpc/include/asm}/poll.h                    |    0 
 .../powerpc/include/asm}/posix_types.h             |    0 
 .../powerpc/include/asm}/ppc-pci.h                 |    0 
 .../powerpc/include/asm}/ppc4xx.h                  |    0 
 .../powerpc/include/asm}/ppc_asm.h                 |    0 
 .../powerpc/include/asm}/processor.h               |    0 
 .../powerpc/include/asm}/prom.h                    |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/ps3.h |    0 
 .../powerpc/include/asm}/ps3av.h                   |    0 
 .../powerpc/include/asm}/ps3fb.h                   |    0 
 .../powerpc/include/asm}/ps3stor.h                 |    0 
 .../powerpc/include/asm}/ptrace.h                  |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/qe.h  |    0 
 .../powerpc/include/asm}/qe_ic.h                   |    2 -
 .../asm-powerpc => arch/powerpc/include/asm}/reg.h |    0 
 .../powerpc/include/asm}/reg_8xx.h                 |    0 
 .../powerpc/include/asm}/reg_booke.h               |    0 
 .../powerpc/include/asm}/reg_fsl_emb.h             |    0 
 .../powerpc/include/asm}/resource.h                |    0 
 .../powerpc/include/asm}/rheap.h                   |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/rio.h |    0 
 .../powerpc/include/asm}/rtas.h                    |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/rtc.h |    0 
 .../powerpc/include/asm}/rwsem.h                   |    4 +-
 .../powerpc/include/asm}/scatterlist.h             |    0 
 .../powerpc/include/asm}/seccomp.h                 |    0 
 .../powerpc/include/asm}/sections.h                |    0 
 .../powerpc/include/asm}/sembuf.h                  |    0 
 .../powerpc/include/asm}/serial.h                  |    0 
 .../powerpc/include/asm}/setjmp.h                  |    0 
 .../powerpc/include/asm}/setup.h                   |    0 
 .../powerpc/include/asm}/shmbuf.h                  |    0 
 .../powerpc/include/asm}/shmparam.h                |    0 
 .../powerpc/include/asm}/sigcontext.h              |    0 
 .../powerpc/include/asm}/siginfo.h                 |    0 
 .../powerpc/include/asm}/signal.h                  |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/smp.h |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/smu.h |    0 
 .../powerpc/include/asm}/socket.h                  |    0 
 .../powerpc/include/asm}/sockios.h                 |    0 
 .../powerpc/include/asm}/sparsemem.h               |    0 
 .../powerpc/include/asm}/spinlock.h                |    0 
 .../powerpc/include/asm}/spinlock_types.h          |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/spu.h |    0 
 .../powerpc/include/asm}/spu_csa.h                 |    0 
 .../powerpc/include/asm}/spu_info.h                |    0 
 .../powerpc/include/asm}/spu_priv1.h               |    0 
 .../powerpc/include/asm}/sstep.h                   |    0 
 .../powerpc/include/asm}/stat.h                    |    0 
 .../powerpc/include/asm}/statfs.h                  |    0 
 .../powerpc/include/asm}/string.h                  |    0 
 .../powerpc/include/asm}/suspend.h                 |    0 
 .../powerpc/include/asm}/synch.h                   |    0 
 .../powerpc/include/asm}/syscall.h                 |    0 
 .../powerpc/include/asm}/syscalls.h                |    0 
 .../powerpc/include/asm}/systbl.h                  |    0 
 .../powerpc/include/asm}/system.h                  |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/tce.h |    0 
 .../powerpc/include/asm}/termbits.h                |    0 
 .../powerpc/include/asm}/termios.h                 |    0 
 .../powerpc/include/asm}/thread_info.h             |    0 
 .../powerpc/include/asm}/time.h                    |    0 
 .../powerpc/include/asm}/timex.h                   |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/tlb.h |    0 
 .../powerpc/include/asm}/tlbflush.h                |    0 
 .../powerpc/include/asm}/topology.h                |    0 
 .../powerpc/include/asm}/tsi108.h                  |    0 
 .../powerpc/include/asm}/tsi108_irq.h              |    0 
 .../powerpc/include/asm}/tsi108_pci.h              |    0 
 .../powerpc/include/asm}/types.h                   |    0 
 .../powerpc/include/asm}/uaccess.h                 |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/ucc.h |    0 
 .../powerpc/include/asm}/ucc_fast.h                |    2 -
 .../powerpc/include/asm}/ucc_slow.h                |    0 
 .../powerpc/include/asm}/ucontext.h                |    0 
 .../powerpc/include/asm}/udbg.h                    |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/uic.h |    2 -
 .../powerpc/include/asm}/unaligned.h               |    0 
 .../powerpc/include/asm}/uninorth.h                |    0 
 .../powerpc/include/asm}/unistd.h                  |    0 
 .../powerpc/include/asm}/user.h                    |    0 
 .../powerpc/include/asm}/vdso.h                    |    0 
 .../powerpc/include/asm}/vdso_datapage.h           |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/vga.h |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/vio.h |    0 
 .../powerpc/include/asm}/xilinx_intc.h             |    0 
 .../powerpc/include/asm}/xmon.h                    |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/xor.h |    0 
 arch/powerpc/kernel/Makefile                       |   14 -
 arch/powerpc/kernel/cpu_setup_44x.S                |    6 -
 arch/powerpc/kernel/irq.c                          |   25 +-
 arch/powerpc/kernel/process.c                      |    2 -
 arch/powerpc/kernel/vdso.c                         |    2 -
 arch/powerpc/lib/Makefile                          |    2 -
 arch/powerpc/mm/mem.c                              |    2 +-
 arch/powerpc/mm/ppc_mmu_32.c                       |    4 +-
 arch/powerpc/mm/tlb_64.c                           |    2 +-
 arch/powerpc/platforms/52xx/Makefile               |    4 +-
 arch/powerpc/platforms/86xx/mpc86xx_smp.c          |    2 +-
 arch/powerpc/platforms/Makefile                    |    6 -
 arch/powerpc/platforms/powermac/Makefile           |    3 +-
 arch/powerpc/sysdev/Makefile                       |    2 -
 drivers/char/hvc_console.h                         |    2 +-
 drivers/char/hvcs.c                                |    2 +-
 drivers/infiniband/hw/ehca/ehca_reqs.c             |    2 +-
 include/asm-powerpc/irq.h                          |  654 --------------------
 283 files changed, 388 insertions(+), 766 deletions(-)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/8253pit.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/8xx_immap.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/Kbuild (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/a.out.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/abs_addr.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/agp.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/asm-compat.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/atomic.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/auxvec.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/backlight.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/bitops.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/bootx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/btext.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/bug.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/bugs.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/byteorder.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cache.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cacheflush.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cell-pmu.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cell-regs.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/checksum.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/clk_interface.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/code-patching.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/compat.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm1.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm2.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cputable.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cputhreads.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/cputime.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/current.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/dbdma.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-generic.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-mmio.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-native.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-regs.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr.h (94%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/delay.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/device.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/div64.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/dma-mapping.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/dma.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/edac.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/eeh.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/eeh_event.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/elf.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/emergency-restart.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/errno.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/exception.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/fb.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/fcntl.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/feature-fixups.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/firmware.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/fixmap.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/floppy.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/fs_pd.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/fsl_gtm.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/fsl_lbc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ftrace.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/futex.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/gpio.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/grackle.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/hardirq.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/heathrow.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/highmem.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/hugetlb.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/hvcall.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/hvconsole.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/hvcserver.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/hw_irq.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/hydra.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/i8259.h (71%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ibmebus.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ide.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_86xx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_cpm2.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_qe.h (99%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/io-defs.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/io.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ioctl.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ioctls.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iommu.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ipcbuf.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ipic.h (93%)
 create mode 100644 arch/powerpc/include/asm/irq.h
 rename {include/asm-powerpc => arch/powerpc/include/asm}/irq_regs.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/irqflags.h (93%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/alpaca.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_event.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_sc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_xm.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_lp_config.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_lp_event.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_types.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/iommu.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/it_lp_queue.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/lpar_map.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/mf.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/vio.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kdebug.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kdump.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kexec.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/keylargo.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kgdb.h (98%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kmap_types.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kprobes.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_asm.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_host.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_para.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_ppc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/libata-portmap.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/linkage.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/lmb.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/local.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/lppaca.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/lv1call.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/machdep.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/macio.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mc146818rtc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mediabay.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mman.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-40x.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-44x.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-8xx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-fsl-booke.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-hash32.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-hash64.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu_context.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mmzone.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/module.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc512x.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc52xx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc52xx_psc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc6xx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc8260.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc86xx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc8xx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mpic.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/msgbuf.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/mutex.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/nvram.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/of_device.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/of_platform.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ohare.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/oprofile_impl.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pSeries_reconfig.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/paca.h (99%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/page.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/page_32.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/page_64.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/param.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/parport.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pasemi_dma.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pci-bridge.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pci.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/percpu.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc-32.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc-64.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-4k.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-64k.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-ppc32.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-ppc64.h (99%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/phyp_dump.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_feature.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_low_i2c.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_pfunc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pmc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/pmi.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/poll.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/posix_types.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc-pci.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc4xx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc_asm.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/processor.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/prom.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3av.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3fb.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3stor.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ptrace.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/qe.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/qe_ic.h (99%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/reg.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_8xx.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_booke.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_fsl_emb.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/resource.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/rheap.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/rio.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/rtas.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/rtc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/rwsem.h (96%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/scatterlist.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/seccomp.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/sections.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/sembuf.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/serial.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/setjmp.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/setup.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/shmbuf.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/shmparam.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/sigcontext.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/siginfo.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/signal.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/smp.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/smu.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/socket.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/sockios.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/sparsemem.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/spinlock.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/spinlock_types.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/spu.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_csa.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_info.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_priv1.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/sstep.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/stat.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/statfs.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/string.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/suspend.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/synch.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/syscall.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/syscalls.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/systbl.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/system.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/tce.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/termbits.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/termios.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/thread_info.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/time.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/timex.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/tlb.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/tlbflush.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/topology.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108_irq.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108_pci.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/types.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/uaccess.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc_fast.h (99%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc_slow.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/ucontext.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/udbg.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/uic.h (95%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/unaligned.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/uninorth.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/unistd.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/user.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/vdso.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/vdso_datapage.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/vga.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/vio.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/xilinx_intc.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/xmon.h (100%)
 rename {include/asm-powerpc => arch/powerpc/include/asm}/xor.h (100%)
 delete mode 100644 include/asm-powerpc/irq.h

Kumar Gala (1):
      powerpc: Remove use of CONFIG_PPC_MERGE

Stephen Rothwell (1):
      powerpc: Move include files to arch/powerpc/include/asm

Tony Breeds (2):
      powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
      powerpc: Force printing of 'total_memory' to unsigned long long

[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Hopefully this one won't be busted... I'll hand back the hat
to paulus for the rest of 2.6.27, but before that, here's a last
pull request.

It brings the powerpc variant of the lockless get_user_pages_fast()
which took some time because I took it out of -mm and had to adjust a
few things, mostly conflicts with other hugetlb stuff that went in.

The diffstat will show a change to drivers/ipmi from Stephen. This
fixes a powerpc specific bit in there and the maintainer hasn't
responded to Stephen so far so we decided to merge it ourselves.

The drivers/serial changes are freescale specific drivers and the
drivers/ide change is a powermac specific driver and has Bart's ack.

Some of the freescale changes look like they aren't purely fixes,
Kumar asked me to pull them as this delay is to blame apparently
on the relevant people doing whatever people do at OLS which doesn't
involve merging patches :-)

So please pull from:

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

 Documentation/powerpc/00-INDEX                     |    2 
 Documentation/powerpc/SBC8260_memory_mapping.txt   |  197 --------------
 .../powerpc/dts-bindings/fsl/cpm_qe/serial.txt     |   11 +
 arch/powerpc/Kconfig                               |    3 
 arch/powerpc/boot/dts/mpc832x_mds.dts              |    1 
 arch/powerpc/boot/dts/mpc832x_rdb.dts              |    1 
 arch/powerpc/boot/dts/mpc8349emitx.dts             |    1 
 arch/powerpc/boot/dts/mpc8349emitxgp.dts           |    1 
 arch/powerpc/boot/dts/mpc834x_mds.dts              |    1 
 arch/powerpc/boot/dts/mpc836x_mds.dts              |    1 
 arch/powerpc/boot/dts/mpc836x_rdk.dts              |   16 -
 arch/powerpc/boot/dts/mpc8377_mds.dts              |    1 
 arch/powerpc/boot/dts/mpc8378_mds.dts              |    1 
 arch/powerpc/boot/dts/mpc8379_mds.dts              |    1 
 arch/powerpc/boot/dts/mpc8536ds.dts                |    1 
 arch/powerpc/boot/dts/mpc8540ads.dts               |    1 
 arch/powerpc/boot/dts/mpc8541cds.dts               |    1 
 arch/powerpc/boot/dts/mpc8544ds.dts                |    1 
 arch/powerpc/boot/dts/mpc8548cds.dts               |    1 
 arch/powerpc/boot/dts/mpc8555cds.dts               |    1 
 arch/powerpc/boot/dts/mpc8560ads.dts               |    1 
 arch/powerpc/boot/dts/mpc8568mds.dts               |    1 
 arch/powerpc/boot/dts/mpc8572ds.dts                |    1 
 arch/powerpc/kernel/lparcfg.c                      |    4 
 arch/powerpc/kernel/ptrace.c                       |   10 -
 arch/powerpc/kernel/ptrace32.c                     |    2 
 arch/powerpc/mm/Makefile                           |    3 
 arch/powerpc/mm/gup.c                              |  280 ++++++++++++++++++++
 arch/powerpc/platforms/83xx/mpc832x_mds.c          |    1 
 arch/powerpc/platforms/83xx/mpc832x_rdb.c          |    1 
 arch/powerpc/platforms/83xx/mpc834x_itx.c          |    1 
 arch/powerpc/platforms/83xx/mpc834x_mds.c          |    1 
 arch/powerpc/platforms/83xx/mpc836x_mds.c          |    1 
 arch/powerpc/platforms/83xx/sbc834x.c              |    1 
 arch/powerpc/platforms/85xx/ksi8560.c              |    1 
 arch/powerpc/platforms/85xx/mpc8536_ds.c           |    1 
 arch/powerpc/platforms/85xx/mpc85xx_ads.c          |    1 
 arch/powerpc/platforms/85xx/mpc85xx_ds.c           |    1 
 arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    1 
 arch/powerpc/platforms/85xx/sbc8560.c              |    1 
 arch/powerpc/platforms/8xx/Kconfig                 |   10 +
 arch/powerpc/platforms/Kconfig                     |    3 
 arch/powerpc/sysdev/cpm1.c                         |  267 +++++++++++++++++++
 arch/powerpc/sysdev/cpm2.c                         |   45 +--
 arch/powerpc/sysdev/cpm_common.c                   |  123 +++++++++
 arch/powerpc/sysdev/rtc_cmos_setup.c               |   23 +-
 drivers/char/ipmi/ipmi_si_intf.c                   |    4 
 drivers/ide/ppc/pmac.c                             |   13 +
 drivers/serial/cpm_uart/cpm_uart.h                 |   11 +
 drivers/serial/cpm_uart/cpm_uart_core.c            |   66 ++++-
 include/asm-powerpc/cpm.h                          |    3 
 include/asm-powerpc/cpm2.h                         |   46 ++-
 include/asm-powerpc/pgtable-ppc64.h                |    2 
 include/linux/pagemap.h                            |   23 ++
 54 files changed, 907 insertions(+), 290 deletions(-)
 delete mode 100644 Documentation/powerpc/SBC8260_memory_mapping.txt
 create mode 100644 arch/powerpc/mm/gup.c

Anton Vorontsov (1):
      powerpc: rtc_cmos_setup: assign interrupts only if there is i8259 PIC

Benjamin Herrenschmidt (1):
      ide/powermac: Fix use of uninitialized pointer on media-bay

Jochen Friedrich (1):
      powerpc: implement GPIO LIB API on CPM1 Freescale SoC.

Kim Phillips (1):
      powerpc/fsl: proliferate simple-bus compatibility to soc nodes

Kumar Gala (2):
      powerpc: clean up the Book-E HW watchpoint support
      powerpc: Fix 8xx build failure

Laurent Pinchart (4):
      cpm2: Implement GPIO LIB API on CPM2 Freescale SoC.
      cpm_uart: Modem control lines support
      cpm_uart: Add generic clock API support to set baudrates
      cpm2: Rework baud rate generators configuration to support external clocks.

Michael Neuling (3):
      powerpc: Correctly hookup PTRACE_GET/SETVSRREGS for 32 bit processes
      powerpc: Fix ptrace buffer size for VSX
      powerpc: Don't use the wrong thread_struct for ptrace get/set VSX regs

Nathan Fontenot (1):
      powerpc: Allow non-hcall return values for lparcfg writes

Nick Piggin (1):
      powerpc/mm: Lockless get_user_pages_fast() for 64-bit (v3)

Paul Gortmaker (1):
      Documentation: remove old sbc8260 board specific information

Stephen Rothwell (1):
      ipmi/powerpc: Use linux/of_{device,platform}.h instead of asm

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

[Grant Likely]

On Tue, Jul 29, 2008 at 07:15:36AM +1000, Benjamin Herrenschmidt wrote:
> On Mon, 2008-07-28 at 09:06 -0700, Linus Torvalds wrote:
> > 
> > On Tue, 29 Jul 2008, Stephen Rothwell wrote:
> > > 
> > > It should be
> > > 
> > > 	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> > > 
> > > Ben seems to have copied from one of Paul's pull requests.
> > 
> > Ok, that one worked for me.
> > 
> > Ben, I'm sure some day you'll get it right on the first try. We're all 
> > cheering for you!
> 
> Should I hang out with a brown paper bag on my head all day today ?

No, that's reserved for committing things to the top level Makefile for
no reason.

g.

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

[Benjamin Herrenschmidt]

On Mon, 2008-07-28 at 10:20 -0600, Grant Likely wrote:
> On Mon, Jul 28, 2008 at 09:06:35AM -0700, Linus Torvalds wrote:
> > 
> > 
> > On Tue, 29 Jul 2008, Stephen Rothwell wrote:
> > > 
> > > It should be
> > > 
> > > 	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> > > 
> > > Ben seems to have copied from one of Paul's pull requests.
> > 
> > Ok, that one worked for me.
> > 
> > Ben, I'm sure some day you'll get it right on the first try. We're all 
> > cheering for you!
> 
> Ben! Ben! He's our man!  If he can't grok it, no-one can!  :-)
> 
> git-request-pull has saved me from many a bogus pull request.

Ah, I didn't know about this critter ! I'm learning new things everyday,
woow !

Ben.

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

[Benjamin Herrenschmidt]

On Mon, 2008-07-28 at 09:06 -0700, Linus Torvalds wrote:
> 
> On Tue, 29 Jul 2008, Stephen Rothwell wrote:
> > 
> > It should be
> > 
> > 	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> > 
> > Ben seems to have copied from one of Paul's pull requests.
> 
> Ok, that one worked for me.
> 
> Ben, I'm sure some day you'll get it right on the first try. We're all 
> cheering for you!

Should I hang out with a brown paper bag on my head all day today ?

Cheers,
Ben.

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

[Benjamin Herrenschmidt]

On Mon, 2008-07-28 at 08:40 -0700, Linus Torvalds wrote:
> 
> On Mon, 28 Jul 2008, Benjamin Herrenschmidt wrote:
> > 
> > It's all in:
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
> 
> It doesn't really seem to be. I get "Already up-to-date.", and the top 
> commit there seems to be from July 3..
> 
> Forgot to push?

No, forgot to s/paulus/benh in the path :-)
> 
> > (Hopefully no silly non-printable character this time, at least
> > nothing I manage to spot with evo but who knows...)
> 
> Yeah, no odd whitespace here either. Not that it helps ;)

Cheers,
Ben.

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

[Grant Likely]

On Mon, Jul 28, 2008 at 09:06:35AM -0700, Linus Torvalds wrote:
> 
> 
> On Tue, 29 Jul 2008, Stephen Rothwell wrote:
> > 
> > It should be
> > 
> > 	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> > 
> > Ben seems to have copied from one of Paul's pull requests.
> 
> Ok, that one worked for me.
> 
> Ben, I'm sure some day you'll get it right on the first try. We're all 
> cheering for you!

Ben! Ben! He's our man!  If he can't grok it, no-one can!  :-)

git-request-pull has saved me from many a bogus pull request.

g.

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

[Linus Torvalds]

On Tue, 29 Jul 2008, Stephen Rothwell wrote:
> 
> It should be
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
> 
> Ben seems to have copied from one of Paul's pull requests.

Ok, that one worked for me.

Ben, I'm sure some day you'll get it right on the first try. We're all 
cheering for you!

			Linus

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 676 bytes --]

Hi Linus,

On Mon, 28 Jul 2008 08:40:44 -0700 (PDT) Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Mon, 28 Jul 2008, Benjamin Herrenschmidt wrote:
> > 
> > It's a