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

Pull s390 update from Martin Schwidefsky:
 "The most prominent change in this patch set is the software dirty bit
  patch for s390.  It removes __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY and
  the page_test_and_clear_dirty primitive which makes the common memory
  management code a bit less obscure.

  Heiko fixed most of the PCI related fallout, more often than not
  missing GENERIC_HARDIRQS dependencies.  Notable is one of the 3270
  patches which adds an export to tty_io to be able to resize a tty.

  The rest is the usual bunch of cleanups and bug fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)
  s390/module: Add missing R_390_NONE relocation type
  drivers/gpio: add missing GENERIC_HARDIRQ dependency
  drivers/input: add couple of missing GENERIC_HARDIRQS dependencies
  s390/cleanup: rename SPP to LPP
  s390/mm: implement software dirty bits
  s390/mm: Fix crst upgrade of mmap with MAP_FIXED
  s390/linker skript: discard exit.data at runtime
  drivers/media: add missing GENERIC_HARDIRQS dependency
  s390/bpf,jit: add vlan tag support
  drivers/net,AT91RM9200: add missing GENERIC_HARDIRQS dependency
  iucv: fix kernel panic at reboot
  s390/Kconfig: sort list of arch selected config options
  phylib: remove !S390 dependeny from Kconfig
  uio: remove !S390 dependency from Kconfig
  dasd: fix sysfs cleanup in dasd_generic_remove
  s390/pci: fix hotplug module init
  s390/pci: cleanup clp page allocation
  s390/pci: cleanup clp inline assembly
  s390/perf: cpum_cf: fallback to software sampling events
  s390/mm: provide PAGE_SHARED define
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/Kconfig
index 27c91c38d1a1ce92d77ced14bd0b70539751b691,17775cf15348ace0302920de7562ebf23f59c655..b220e152aefa23ca6b691f0bf7d441ff998a0a31
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -128,17 -91,56 +91,55 @@@ config S39
        select ARCH_INLINE_WRITE_UNLOCK_BH
        select ARCH_INLINE_WRITE_UNLOCK_IRQ
        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
-       select HAVE_UID16 if 32BIT
+       select ARCH_SAVE_PAGE_KEYS if HIBERNATION
        select ARCH_WANT_IPC_PARSE_VERSION
-       select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT
+       select BUILDTIME_EXTABLE_SORT
+       select CLONE_BACKWARDS2
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_CPU_DEVICES if !SMP
+       select GENERIC_KERNEL_THREAD
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL_OLD
-       select GENERIC_CLOCKEVENTS
-       select KTIME_SCALAR if 32BIT
+       select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+       select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
+       select HAVE_ARCH_MUTEX_CPU_RELAX
        select HAVE_ARCH_SECCOMP_FILTER
 -      select HAVE_IRQ_WORK
+       select HAVE_ARCH_TRACEHOOK
+       select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT
+       select HAVE_BPF_JIT if 64BIT && PACK_STACK
+       select HAVE_CMPXCHG_DOUBLE
+       select HAVE_CMPXCHG_LOCAL
+       select HAVE_C_RECORDMCOUNT
+       select HAVE_DEBUG_KMEMLEAK
+       select HAVE_DYNAMIC_FTRACE
+       select HAVE_FTRACE_MCOUNT_RECORD
+       select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_FUNCTION_TRACER
+       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+       select HAVE_KERNEL_BZIP2
+       select HAVE_KERNEL_GZIP
+       select HAVE_KERNEL_LZMA
+       select HAVE_KERNEL_LZO
+       select HAVE_KERNEL_XZ
+       select HAVE_KPROBES
+       select HAVE_KRETPROBES
+       select HAVE_KVM if 64BIT
+       select HAVE_MEMBLOCK
+       select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_MOD_ARCH_SPECIFIC
+       select HAVE_OPROFILE
+       select HAVE_PERF_EVENTS
+       select HAVE_REGS_AND_STACK_ACCESS_API
+       select HAVE_SYSCALL_TRACEPOINTS
+       select HAVE_SYSCALL_WRAPPERS
+       select HAVE_UID16 if 32BIT
+       select HAVE_VIRT_CPU_ACCOUNTING
+       select INIT_ALL_POSSIBLE
+       select KTIME_SCALAR if 32BIT
        select MODULES_USE_ELF_RELA
-       select CLONE_BACKWARDS2
+       select SYSCTL_EXCEPTION_TRACE
+       select USE_GENERIC_SMP_HELPERS if SMP
+       select VIRT_CPU_ACCOUNTING
  
  config SCHED_OMIT_FRAME_POINTER
        def_bool y

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

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/s390/char/tty3270.c
Simple merge

diff --cc drivers/s390/net/qeth_core.h
Simple merge

diff --cc drivers/tty/tty_io.c
Simple merge