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

Pull s390 updates from Heiko Carstens:
 "Since Martin is on vacation you get the s390 pull request for the
  v4.15 merge window this time from me.

  Besides a lot of cleanups and bug fixes these are the most important
  changes:

   - a new regset for runtime instrumentation registers

   - hardware accelerated AES-GCM support for the aes_s390 module

   - support for the new CEX6S crypto cards

   - support for FORTIFY_SOURCE

   - addition of missing z13 and new z14 instructions to the in-kernel
     disassembler

   - generate opcode tables for the in-kernel disassembler out of a
     simple text file instead of having to manually maintain those
     tables

   - fast memset16, memset32 and memset64 implementations

   - removal of named saved segment support

   - hardware counter support for z14

   - queued spinlocks and queued rwlocks implementations for s390

   - use the stack_depth tracking feature for s390 BPF JIT

   - a new s390_sthyi system call which emulates the sthyi (store
     hypervisor information) instruction

   - removal of the old KVM virtio transport

   - an s390 specific CPU alternatives implementation which is used in
     the new spinlock code"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (88 commits)
  MAINTAINERS: add virtio-ccw.h to virtio/s390 section
  s390/noexec: execute kexec datamover without DAT
  s390: fix transactional execution control register handling
  s390/bpf: take advantage of stack_depth tracking
  s390: simplify transactional execution elf hwcap handling
  s390/zcrypt: Rework struct ap_qact_ap_info.
  s390/virtio: remove unused header file kvm_virtio.h
  s390: avoid undefined behaviour
  s390/disassembler: generate opcode tables from text file
  s390/disassembler: remove insn_to_mnemonic()
  s390/dasd: avoid calling do_gettimeofday()
  s390: vfio-ccw: Do not attempt to free no-op, test and tic cda.
  s390: remove named saved segment support
  s390/archrandom: Reconsider s390 arch random implementation
  s390/pci: do not require AIS facility
  s390/qdio: sanitize put_indicator
  s390/qdio: use atomic_cmpxchg
  s390/nmi: avoid using long-displacement facility
  s390: pass endianness info to sparse
  s390/decompressor: remove informational messages
  ...

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/boot/compressed/Makefile
Simple merge

diff --cc arch/s390/boot/compressed/misc.c
Simple merge

diff --cc arch/s390/include/asm/archrandom.h
Simple merge

diff --cc arch/s390/include/asm/atomic_ops.h
Simple merge

diff --cc arch/s390/include/asm/ccwgroup.h
Simple merge

diff --cc arch/s390/include/asm/cpacf.h
Simple merge

diff --cc arch/s390/include/asm/ctl_reg.h
Simple merge

diff --cc arch/s390/include/asm/debug.h
Simple merge

diff --cc arch/s390/include/asm/dis.h
Simple merge

diff --cc arch/s390/include/asm/ipl.h
Simple merge

diff --cc arch/s390/include/asm/lowcore.h
Simple merge

diff --cc arch/s390/include/asm/nmi.h
Simple merge

diff --cc arch/s390/include/asm/pci_debug.h
Simple merge

diff --cc arch/s390/include/asm/pci_insn.h
Simple merge

diff --cc arch/s390/include/asm/pgalloc.h
Simple merge

diff --cc arch/s390/include/asm/processor.h
Simple merge

diff --cc arch/s390/include/asm/runtime_instr.h
Simple merge

diff --cc arch/s390/include/asm/sections.h
Simple merge

diff --cc arch/s390/include/asm/setup.h
Simple merge

diff --cc arch/s390/include/asm/smp.h
Simple merge

diff --cc arch/s390/include/asm/spinlock.h
Simple merge

diff --cc arch/s390/include/asm/spinlock_types.h
Simple merge

diff --cc arch/s390/include/asm/string.h
Simple merge

diff --cc arch/s390/include/asm/switch_to.h
Simple merge

diff --cc arch/s390/include/asm/topology.h
Simple merge

diff --cc arch/s390/include/asm/vdso.h
Simple merge

diff --cc arch/s390/include/uapi/asm/unistd.h
Simple merge

diff --cc arch/s390/kernel/Makefile
Simple merge

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

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

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

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

diff --cc arch/s390/kernel/entry.S
Simple merge

diff --cc arch/s390/kernel/entry.h
Simple merge

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

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

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

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

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

diff --cc arch/s390/kernel/relocate_kernel.S
Simple merge

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

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

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

diff --cc arch/s390/kernel/syscalls.S
Simple merge

diff --cc arch/s390/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/s390/lib/mem.S
Simple merge

diff --cc arch/s390/lib/spinlock.c
Simple merge

diff --cc arch/s390/lib/string.c
Simple merge

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

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

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

diff --cc arch/s390/net/bpf_jit.h
Simple merge

diff --cc arch/s390/net/bpf_jit_comp.c
Simple merge

diff --cc arch/s390/tools/Makefile
Simple merge

diff --cc drivers/s390/block/dasd_eer.c
Simple merge

diff --cc drivers/s390/block/dasd_int.h
Simple merge

diff --cc drivers/s390/block/scm_blk.h
Simple merge

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

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

diff --cc drivers/s390/char/vmur.h
Simple merge

diff --cc drivers/s390/cio/cio_debug.h
Simple merge

diff --cc drivers/s390/cio/qdio_debug.h
Simple merge

diff --cc drivers/s390/cio/qdio_thinint.c
Simple merge

diff --cc drivers/s390/cio/vfio_ccw_cp.c
Simple merge

diff --cc drivers/s390/crypto/ap_asm.h
Simple merge

diff --cc drivers/s390/crypto/ap_card.c
Simple merge

diff --cc drivers/s390/crypto/ap_queue.c
Simple merge

diff --cc include/uapi/linux/elf.h
Simple merge