Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)
  powerpc: fix compile error with 85xx/p1010rdb.c
  powerpc: fix compile error with 85xx/p1023_rds.c
  powerpc/fsl: add MSI support for the Freescale hypervisor
  arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree
  powerpc/fsl: Add support for Integrated Flash Controller
  powerpc/fsl: update compatiable on fsl 16550 uart nodes
  powerpc/85xx: fix PCI and localbus properties in p1022ds.dts
  powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig
  powerpc/fsl: Update defconfigs to enable some standard FSL HW features
  powerpc: Add TBI PHY node to first MDIO bus
  sbc834x: put full compat string in board match check
  powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address
  powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit
  offb: Fix setting of the pseudo-palette for >8bpp
  offb: Add palette hack for qemu "standard vga" framebuffer
  offb: Fix bug in calculating requested vram size
  powerpc/boot: Change the WARN to INFO for boot wrapper overlap message
  powerpc/44x: Fix build error on currituck platform
  powerpc/boot: Change the load address for the wrapper to fit the kernel
  powerpc/44x: Enable CRASH_DUMP for 440x
  ...

Fix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to
the additional sparse-checking code for cputime_t.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/boot/dts/tqm8548-bigflash.dts
Simple merge

diff --cc arch/powerpc/boot/dts/tqm8548.dts
Simple merge

diff --cc arch/powerpc/include/asm/cputime.h
index 6ec1c38,33a3580..487d46f
--- 1/arch/powerpc/include/asm/cputime.h
--- 2/arch/powerpc/include/asm/cputime.h
+++ b/arch/powerpc/include/asm/cputime.h
@@@ -114,7 -130,7 +114,7 @@@ extern u64 __cputime_usec_factor
  
  static inline unsigned long cputime_to_usecs(const cputime_t ct)
  {
-       return mulhdu((__force u64) ct, __cputime_msec_factor) * USEC_PER_MSEC;
 -      return mulhdu(ct, __cputime_usec_factor);
++      return mulhdu((__force u64) ct, __cputime_usec_factor);
  }
  
  static inline cputime_t usecs_to_cputime(const unsigned long us)

diff --cc arch/powerpc/kernel/idle.c
Simple merge

diff --cc arch/powerpc/kernel/machine_kexec.c
Simple merge

diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge

diff --cc arch/powerpc/mm/init_32.c
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/powerpc/mm/tlb_nohash.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/lpar.c
index 52d429b,dc36ea6..948e0e3
--- 1/arch/powerpc/platforms/pseries/lpar.c
--- 2/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@@ -554,9 -554,8 +554,10 @@@ void __trace_hcall_entry(unsigned long 
                goto out;
  
        (*depth)++;
+       preempt_disable();
        trace_hcall_entry(opcode, args);
 +      if (opcode == H_CEDE)
 +              rcu_idle_enter();
        (*depth)--;
  
  out:
@@@ -577,9 -576,8 +578,10 @@@ void __trace_hcall_exit(long opcode, un
                goto out;
  
        (*depth)++;
 +      if (opcode == H_CEDE)
 +              rcu_idle_exit();
        trace_hcall_exit(opcode, retval, retbuf);
+       preempt_enable();
        (*depth)--;
  
  out: