Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git

# Conflicts:
#	arch/s390/include/asm/io.h

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/configs/debug_defconfig
Simple merge

diff --cc arch/s390/include/asm/io.h
index 82f1043a4fc32a57f08203fa511e94eda26caa2e,251e0372ccbd0a63fb859ebe2540c78d2a42a47b..faddb9aef3b8fb84f4b53de312017d06ec8ce32b
--- 1/arch/s390/include/asm/io.h
--- 2/arch/s390/include/asm/io.h
+++ b/arch/s390/include/asm/io.h
@@@ -33,9 -33,7 +33,7 @@@ void unxlate_dev_mem_ptr(phys_addr_t ph
  #define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL)
  
  #define ioremap_wc(addr, size)  \
 -      ioremap_prot((addr), (size), pgprot_val(pgprot_writecombine(PAGE_KERNEL)))
 +      ioremap_prot((addr), (size), pgprot_writecombine(PAGE_KERNEL))
- #define ioremap_wt(addr, size)  \
-       ioremap_prot((addr), (size), pgprot_writethrough(PAGE_KERNEL))
  
  static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
  {

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

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/s390/mm/gmap.c
Simple merge

diff --cc arch/s390/mm/init.c
Simple merge

diff --cc arch/s390/pci/pci.c
Simple merge