Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
	arch/hexagon/Kconfig
	arch/m68k/Kconfig
	arch/score/Kconfig

diff --cc arch/alpha/kernel/pci.c
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/frv/Kconfig
Simple merge

diff --cc arch/hexagon/Kconfig
index a35ec474d0c18e048b1c5461321e68c20701080d,9059e3905887196a48750cf3e531abf0aa6d96df..acdc187a5410fe84fcd3f40e852c1db6c231a4e6
--- 1/arch/hexagon/Kconfig
--- 2/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@@ -24,7 -26,8 +24,8 @@@ config HEXAGO
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select NO_IOPORT
 -      # mostly generic routines, with some accelerated ones
 +      select STACKTRACE_SUPPORT
+       select GENERIC_IOMAP
        ---help---
          Qualcomm Hexagon is a processor architecture designed for high
          performance and low power across a wide variety of applications.
@@@ -71,9 -74,15 +72,6 @@@ config GENERIC_CSU
  config GENERIC_IRQ_PROBE
        def_bool y
  
- config GENERIC_IOMAP
-       def_bool y
 -#config ZONE_DMA
 -#     bool
 -#     default y
 -
 -config HAS_DMA
 -      bool
 -      select HAVE_DMA_ATTRS
 -      default y
--
  config NEED_SG_DMA_LENGTH
        def_bool y
  

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/m68k/Kconfig
index 32fd3642e71b6d0ac091efcd19638d57e27a4d22,973e68614f28eb5a0c79627be9c370d73080f6da..853570ea162c89ed83d34a4318c7fd6674d739a0
--- 1/arch/m68k/Kconfig
--- 2/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -37,12 -38,6 +37,9 @@@ config GENERIC_CALIBRATE_DELA
        bool
        default y
  
- config GENERIC_IOMAP
-       def_bool MMU
- 
 +config GENERIC_CSUM
 +      bool
 +
  config TIME_LOW_RES
        bool
        default y

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/score/Kconfig
index 8b0c9464aa9d10ece5562bad884969665ee6f348,455ce2d76823eb6c582c30bb3491b3886bbc8276..3df65d39abc15f361df4cc61eace374af74e4c17
--- 1/arch/score/Kconfig
--- 2/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@@ -4,9 -4,7 +4,10 @@@ config SCOR
         def_bool y
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
+        select GENERIC_IOMAP
 +       select HAVE_MEMBLOCK
 +       select HAVE_MEMBLOCK_NODE_MAP
 +       select ARCH_DISCARD_MEMBLOCK
  
  choice
        prompt "System type"

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sh/drivers/pci/pci.c
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/tile/include/asm/pci.h
Simple merge

diff --cc arch/tile/kernel/pci.c
Simple merge

diff --cc arch/x86/Kconfig
index 0b57ddfe57245a6945fe2d60bb2007ee28f2f620,08af6457de7245c27af8701d6549ccb615f80119..071e0db26050ad835058e6d0ca224da68d8329f6
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -77,9 -75,10 +77,10 @@@ config X8
        select HAVE_BPF_JIT if (X86_64 && NET)
        select CLKEVT_I8253
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
+       select GENERIC_IOMAP
  
  config INSTRUCTION_DECODER
 -      def_bool (KPROBES || PERF_EVENTS)
 +      def_bool (KPROBES || PERF_EVENTS || UPROBES)
  
  config OUTPUT_FORMAT
        string

diff --cc include/asm-generic/io.h
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge