Merge remote-tracking branch 'powerpc/next'

# Conflicts:
#	arch/powerpc/sysdev/xive/common.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
index 678a0acbad7b1a651aaf223ee9e17a584d4c4c34,ec866085ff8b1921f2148a95b7aef4eca8bbcb38..8a93b509337d66a63cd45517a7ca0907fc2602ad
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -182,7 -183,10 +183,8 @@@ config PP
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_PCI_IOMAP                if PCI
+       select GENERIC_PTDUMP
        select GENERIC_SMP_IDLE_THREAD
 -      select GENERIC_STRNCPY_FROM_USER
 -      select GENERIC_STRNLEN_USER
        select GENERIC_TIME_VSYSCALL
        select GENERIC_VDSO_TIME_NS
        select HAVE_ARCH_AUDITSYSCALL

diff --cc arch/powerpc/include/asm/ptrace.h
Simple merge

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

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

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

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

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

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

diff --cc arch/powerpc/platforms/pasemi/idle.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge

diff --cc arch/powerpc/sysdev/xive/common.c
index 8183ca343675a4c3c90ca806fddd6d3fc5d2c6dd,458645c7a72bf3f8f5ad010e0da2e510fa69e1f5..c732ce5a3e1a500746feb41649d78b8a164ae354
--- 1/arch/powerpc/sysdev/xive/common.c
--- 2/arch/powerpc/sysdev/xive/common.c
+++ b/arch/powerpc/sysdev/xive/common.c
@@@ -1170,22 -1166,6 +1157,22 @@@ out
        return ret;
  }
  
-                         IRQF_PERCPU | IRQF_NO_THREAD,
 +static int xive_request_ipi(unsigned int cpu)
 +{
 +      struct xive_ipi_desc *xid = &xive_ipis[early_cpu_to_node(cpu)];
 +      int ret;
 +
 +      if (atomic_inc_return(&xid->started) > 1)
 +              return 0;
 +
 +      ret = request_irq(xid->irq, xive_muxed_ipi_action,
++                        IRQF_NO_DEBUG | IRQF_PERCPU | IRQF_NO_THREAD,
 +                        xid->name, NULL);
 +
 +      WARN(ret < 0, "Failed to request IPI %d: %d\n", xid->irq, ret);
 +      return ret;
 +}
 +
  static int xive_setup_cpu_ipi(unsigned int cpu)
  {
        unsigned int xive_ipi_irq = xive_ipi_cpu_to_irq(cpu);

diff --cc drivers/cpufreq/powernv-cpufreq.c
Simple merge

diff --cc kernel/irq/irqdomain.c
Simple merge

diff --cc scripts/mod/modpost.c
Simple merge