Hi Linus, please pull from the 'for-linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus to receive the following updates: The bulk of the s390 patches for 4.13. Some new things but mostly bug fixes and cleanups. Noteworthy changes: * The SCM block driver is converted to blk-mq * Switch s390 to 5 level page tables. The virtual address space for a user space process can now have up to 16EB-4KB. * Introduce a ELF phdr flag for qemu to avoid the global vm.alloc_pgste which forces all processes to large page tables * A couple of PCI improvements to improve error recovery * Included is the merge of the base support for proper machine checks for KVM Christian Borntraeger (1): s390/smp: fix false positive kmemleak of mcesa data structure Harald Freudenberger (4): s390/zcrypt: remove unused function zcrypt_type6_mex_key_de() s390/crypto: fix aes/paes Kconfig dependeny s390/zcrypt: Rework ap init in case of out of range domain param. s390/zcrypt: Add some debug messages on failure. Heiko Carstens (17): s390: add missing header includes for type checking s390/pkey: make pkey_init() static s390/mm: add __rcu annotations s390/pkey: add missing __user annotations s390: use two more generic header files s390/zcrypt: get rid of little/big endian handling s390/hvc_iucv: fix broken Kconfig select statement s390/smp: use sigp condition code define s390/fault: use _ASCE_ORIGIN instead of PAGE_MASK s390/facilities: remove stfle requirement s390/mm: remove incorrect _REGION3_ENTRY_ORIGIN define s390/mm: add p?d_folded() helper functions s390/dumpstack: remove raw stack dump s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPL s390/mm: use correct address space when enabling DAT s390: rename psw_bits enums s390: rename struct psw_bits members Jan Höppner (3): s390/dasd: Remove variable sized array s390/dasd: Display read-only attribute correctly s390/dasd: Fix faulty ENODEV for RO sysfs attribute Logan Gunthorpe (1): s390: provide default ioremap and iounmap declaration Martin Schwidefsky (6): s390/mm: implement 5 level pages tables s390/cputime: simplify account_system_index_scaled s390/vdso: use _install_special_mapping to establish vdso s390/ptrace: guarded storage regset for the current task s390/kvm: avoid global config of vm.alloc_pgste=1 s390/fpu: export save_fpu_regs for all configs QingFeng Hao (2): s390/nmi: s390: New low level handling for machine check happening in guest KVM: s390: Backup the guest's machine check info Sebastian Ott (14): s390/scm: remove cluster option s390/scm: convert to blk-mq s390/scm: convert tasklet s390/scm: use multiple queues s390/cio: introduce io_subchannel_type s390/pci: don't cleanup in arch_setup_msi_irqs s390/pci: improve error handling during interrupt deregistration s390/pci: improve unreg_ioat error handling s390/pci: improve error handling during fmb (de)registration s390/pci: introduce clp_get_state s390/pci: improve pci hotplug s390/pci: fix handling of PEC 306 s390/pci: provide more debug information s390/pci: recognize name clashes with uids Stefan Haberland (2): s390/dasd: fix unusable device after safe offline processing s390/dasd: fix hanging safe offline Thomas Huth (1): s390: Remove 'message security assist' from the list of vital facilities Thomas Richter (1): s390/perf: fix null string in perf list pmu command arch/s390/Kconfig | 3 +- arch/s390/crypto/Makefile | 3 +- arch/s390/crypto/arch_random.c | 1 + arch/s390/include/asm/Kbuild | 2 + arch/s390/include/asm/device.h | 10 -- arch/s390/include/asm/elf.h | 32 +++++ arch/s390/include/asm/fb.h | 12 -- arch/s390/include/asm/io.h | 4 +- arch/s390/include/asm/kvm_host.h | 17 ++- arch/s390/include/asm/mmu_context.h | 4 +- arch/s390/include/asm/nmi.h | 7 + arch/s390/include/asm/page.h | 3 + arch/s390/include/asm/pci.h | 15 +- arch/s390/include/asm/pci_insn.h | 2 +- arch/s390/include/asm/pgalloc.h | 25 +++- arch/s390/include/asm/pgtable.h | 105 +++++++++++--- arch/s390/include/asm/processor.h | 6 +- arch/s390/include/asm/ptrace.h | 54 +++---- arch/s390/include/asm/sigp.h | 2 +- arch/s390/include/asm/thread_info.h | 1 + arch/s390/include/asm/tlb.h | 15 ++ arch/s390/kernel/asm-offsets.c | 3 + arch/s390/kernel/dumpstack.c | 33 +---- arch/s390/kernel/entry.S | 30 +++- arch/s390/kernel/ipl.c | 7 +- arch/s390/kernel/nmi.c | 84 +++++++++-- arch/s390/kernel/perf_cpum_sf.c | 10 +- arch/s390/kernel/perf_event.c | 3 +- arch/s390/kernel/ptrace.c | 15 +- arch/s390/kernel/smp.c | 3 + arch/s390/kernel/traps.c | 1 + arch/s390/kernel/uprobes.c | 12 +- arch/s390/kernel/vdso.c | 91 ++++++++---- arch/s390/kernel/vtime.c | 14 +- arch/s390/kvm/gaccess.c | 22 +-- arch/s390/kvm/gaccess.h | 4 +- arch/s390/kvm/guestdbg.c | 6 +- arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/priv.c | 8 +- arch/s390/mm/dump_pagetables.c | 23 ++- arch/s390/mm/fault.c | 2 +- arch/s390/mm/gmap.c | 11 +- arch/s390/mm/gup.c | 33 ++++- arch/s390/mm/hugetlbpage.c | 30 ++-- arch/s390/mm/init.c | 6 +- arch/s390/mm/mmap.c | 4 +- arch/s390/mm/pageattr.c | 30 +++- arch/s390/mm/pgalloc.c | 57 +++++--- arch/s390/mm/pgtable.c | 6 +- arch/s390/mm/vmem.c | 44 +++++- arch/s390/pci/pci.c | 173 ++++++++++++---------- arch/s390/pci/pci_clp.c | 77 ++++++---- arch/s390/pci/pci_dma.c | 4 +- arch/s390/pci/pci_event.c | 14 +- arch/s390/pci/pci_insn.c | 10 +- arch/s390/tools/gen_facilities.c | 2 - drivers/crypto/Kconfig | 15 +- drivers/s390/block/Kconfig | 7 - drivers/s390/block/Makefile | 3 - drivers/s390/block/dasd.c | 76 +++++----- drivers/s390/block/dasd_devmap.c | 75 ++++++---- drivers/s390/block/scm_blk.c | 262 +++++++++++++++------------------- drivers/s390/block/scm_blk.h | 60 +------- drivers/s390/block/scm_blk_cluster.c | 255 --------------------------------- drivers/s390/cio/css.c | 49 +++++++ drivers/s390/cio/device.c | 42 ------ drivers/s390/cio/vfio_ccw_drv.c | 58 +------- drivers/s390/crypto/ap_bus.c | 21 ++- drivers/s390/crypto/pkey_api.c | 6 +- drivers/s390/crypto/zcrypt_api.c | 12 +- drivers/s390/crypto/zcrypt_cca_key.h | 115 +-------------- drivers/s390/crypto/zcrypt_msgtype6.c | 4 +- drivers/tty/hvc/Kconfig | 2 +- 73 files changed, 1136 insertions(+), 1122 deletions(-) delete mode 100644 arch/s390/include/asm/device.h delete mode 100644 arch/s390/include/asm/fb.h delete mode 100644 drivers/s390/block/scm_blk_cluster.c -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html