Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: "Among the usual minor bug fixes the more interesting patches are the perf counters for the latest machine, the missing select to enable transparent huge pages and a build fix for the UAPI rework." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390,uapi: do not use uapi/asm-generic/kvm_para.h s390/cache: fix data/instruction cache output s390: fix linker script for 31 bit builds s390/thp: select HAVE_ARCH_TRANSPARENT_HUGEPAGE s390/kdump: Use 64 bit mode for 0x10000 entry point perf_cpum_cf: Add support for counters available with IBM zEC12 s390/css: stop stsch loop after cc 3 s390/cio: use generic bitmap functions s390/chpid: make headers usable (again)
Showing
- arch/s390/Kconfig 1 addition, 0 deletionsarch/s390/Kconfig
- arch/s390/boot/compressed/vmlinux.lds.S 1 addition, 1 deletionarch/s390/boot/compressed/vmlinux.lds.S
- arch/s390/include/asm/perf_event.h 1 addition, 1 deletionarch/s390/include/asm/perf_event.h
- arch/s390/include/uapi/asm/Kbuild 0 additions, 2 deletionsarch/s390/include/uapi/asm/Kbuild
- arch/s390/include/uapi/asm/chpid.h 5 additions, 5 deletionsarch/s390/include/uapi/asm/chpid.h
- arch/s390/include/uapi/asm/kvm_para.h 11 additions, 0 deletionsarch/s390/include/uapi/asm/kvm_para.h
- arch/s390/kernel/cache.c 6 additions, 3 deletionsarch/s390/kernel/cache.c
- arch/s390/kernel/head_kdump.S 2 additions, 8 deletionsarch/s390/kernel/head_kdump.S
- arch/s390/kernel/perf_cpum_cf.c 5 additions, 1 deletionarch/s390/kernel/perf_cpum_cf.c
- arch/s390/kernel/vmlinux.lds.S 1 addition, 1 deletionarch/s390/kernel/vmlinux.lds.S
- drivers/s390/cio/css.c 6 additions, 1 deletiondrivers/s390/cio/css.c
- drivers/s390/cio/idset.c 14 additions, 12 deletionsdrivers/s390/cio/idset.c
- drivers/s390/cio/idset.h 2 additions, 1 deletiondrivers/s390/cio/idset.h
Loading
Please register or sign in to comment