Patchwork [git,pull] Please pull powerpc.git merge branch

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date Aug. 10, 2011, 3:27 p.m.
Message ID <1312990072.1674.5.camel@pasglop>
Download mbox
Permalink /patch/109389/
State Not Applicable
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED..

Comments

Benjamin Herrenschmidt - Aug. 10, 2011, 3:27 p.m.
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(-)
Linus Torvalds - Aug. 10, 2011, 6:07 p.m.
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
Benjamin Herrenschmidt - Aug. 10, 2011, 6:55 p.m.
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.