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: (99 commits)
  drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
  powerpc/85xx: fix mpic configuration in CAMP mode
  powerpc: Copy back TIF flags on return from softirq stack
  powerpc/64: Make server perfmon only built on ppc64 server devices
  powerpc/pseries: Fix hvc_vio.c build due to recent changes
  powerpc: Exporting boot_cpuid_phys
  powerpc: Add CFAR to oops output
  hvc_console: Add kdb support
  powerpc/pseries: Fix hvterm_raw_get_chars to accept < 16 chars, fixing xmon
  powerpc/irq: Quieten irq mapping printks
  powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs
  powerpc: Add mpt2sas driver to pseries and ppc64 defconfig
  powerpc: Disable IRQs off tracer in ppc64 defconfig
  powerpc: Sync pseries and ppc64 defconfigs
  powerpc/pseries/hvconsole: Fix dropped console output
  hvc_console: Improve tty/console put_chars handling
  powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
  powerpc/mm: Fix output of total_ram.
  powerpc/cpufreq: Add cpufreq driver for Momentum Maple boards
  powerpc: Correct annotations of pmu registration functions
  ...

Fix up trivial Kconfig/Makefile conflicts in arch/powerpc, drivers, and
drivers/cpufreq

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
index cdf7a0a,f8e578b..374c475
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -134,7 -134,7 +134,8 @@@ config PP
        select GENERIC_IRQ_SHOW_LEVEL
        select HAVE_RCU_TABLE_FREE if SMP
        select HAVE_SYSCALL_TRACEPOINTS
 +      select HAVE_BPF_JIT if (PPC64 && NET)
+       select HAVE_ARCH_JUMP_LABEL
  
  config EARLY_PRINTK
        bool

diff --cc arch/powerpc/Makefile
Simple merge

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

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

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

diff --cc arch/powerpc/kernel/head_fsl_booke.S
Simple merge

diff --cc arch/powerpc/kernel/mpc7450-pmu.c
Simple merge

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

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

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

diff --cc arch/powerpc/kernel/power4-pmu.c
Simple merge

diff --cc arch/powerpc/kernel/power5+-pmu.c
Simple merge

diff --cc arch/powerpc/kernel/power5-pmu.c
Simple merge

diff --cc arch/powerpc/kernel/power6-pmu.c
Simple merge

diff --cc arch/powerpc/kernel/power7-pmu.c
Simple merge

diff --cc arch/powerpc/kernel/ppc970-pmu.c
Simple merge

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

diff --cc arch/powerpc/kernel/setup-common.c
Simple merge

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

diff --cc arch/powerpc/kernel/smp.c
index 09a85a9,567a174..f932f8a
--- 1/arch/powerpc/kernel/smp.c
--- 2/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@@ -241,9 -243,8 +243,9 @@@ static inline void do_message_pass(int 
  void smp_send_reschedule(int cpu)
  {
        if (likely(smp_ops))
-               smp_ops->message_pass(cpu, PPC_MSG_RESCHEDULE);
+               do_message_pass(cpu, PPC_MSG_RESCHEDULE);
  }
 +EXPORT_SYMBOL_GPL(smp_send_reschedule);
  
  void arch_send_call_function_single_ipi(int cpu)
  {

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

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

diff --cc arch/powerpc/sysdev/fsl_pci.c
Simple merge

diff --cc arch/powerpc/sysdev/ppc4xx_pci.c
Simple merge

diff --cc drivers/Kconfig
index 9e7a4f5,3c1d4a5..95b9e7e
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -126,6 -126,6 +126,8 @@@ source "drivers/hwspinlock/Kconfig
  
  source "drivers/clocksource/Kconfig"
  
 +source "drivers/iommu/Kconfig"
 +
+ source "drivers/virt/Kconfig"
+ 
  endmenu

diff --cc drivers/Makefile
index 939fcde,cd546eb..7fa433a
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -122,5 -122,6 +122,8 @@@ obj-y                              += ieee802154
  obj-y                         += clk/
  
  obj-$(CONFIG_HWSPINLOCK)      += hwspinlock/
 +obj-$(CONFIG_NFC)             += nfc/
 +obj-$(CONFIG_IOMMU_SUPPORT)   += iommu/
+ 
+ # Virtualization drivers
+ obj-$(CONFIG_VIRT_DRIVERS)    += virt/

diff --cc drivers/cpufreq/Kconfig
index e898215,61ae639..e24a2a1
--- 1/drivers/cpufreq/Kconfig
--- 2/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@@ -184,10 -184,10 +184,15 @@@ depends on X8
  source "drivers/cpufreq/Kconfig.x86"
  endmenu
  
 +menu "ARM CPU frequency scaling drivers"
 +depends on ARM
 +source "drivers/cpufreq/Kconfig.arm"
 +endmenu
 +
+ menu "PowerPC CPU frequency scaling drivers"
+ depends on PPC32 || PPC64
+ source "drivers/cpufreq/Kconfig.powerpc"
+ endmenu
+ 
  endif
  endmenu

diff --cc drivers/cpufreq/Makefile
index ab75e57,ca3796d..a48bc02
--- 1/drivers/cpufreq/Makefile
--- 2/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@@ -37,9 -37,12 +37,13 @@@ obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)        +
  obj-$(CONFIG_X86_P4_CLOCKMOD)         += p4-clockmod.o
  obj-$(CONFIG_X86_CPUFREQ_NFORCE2)     += cpufreq-nforce2.o
  
 -##################################################################################d
 -
 +##################################################################################
  # ARM SoC drivers
  obj-$(CONFIG_UX500_SOC_DB8500)                += db8500-cpufreq.o
 +obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)     += s3c64xx-cpufreq.o
 +obj-$(CONFIG_ARM_S5PV210_CPUFREQ)     += s5pv210-cpufreq.o
 +obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)  += exynos4210-cpufreq.o
+ 
 -
 -##################################################################################d
++##################################################################################
+ # PowerPC platform drivers
+ obj-$(CONFIG_CPU_FREQ_MAPLE)          += maple-cpufreq.o

diff --cc drivers/of/platform.c
Simple merge