Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: - a fix for the vfio ccw translation code - update an incorrect email address in the MAINTAINERS file - fix a division by zero oops in the cpum_sf code found by trinity - two fixes for the error handling of the qdio code - several spectre related patches to convert all left-over indirect branches in the kernel to expoline branches - update defconfigs to avoid warnings due to the netfilter Kconfig changes - avoid several compiler warnings in the kexec_file code for s390 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/qdio: don't release memory in qdio_setup_irq() s390/qdio: fix access to uninitialized qdio_q fields s390/cpum_sf: ensure sample frequency of perf event attributes is non-zero s390: use expoline thunks in the BPF JIT s390: extend expoline to BC instructions s390: remove indirect branch from do_softirq_own_stack s390: move spectre sysfs attribute code s390/kernel: use expoline for indirect branches s390/ftrace: use expoline for indirect branches s390/lib: use expoline for indirect branches s390/crc32-vx: use expoline for indirect branches s390: move expoline assembler macros to a header vfio: ccw: fix cleanup if cp_prefetch fails s390/kexec_file: add declaration of purgatory related globals s390: update defconfigs MAINTAINERS: update s390 zcrypt maintainers email address
No related branches found
No related tags found
Showing
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- arch/s390/configs/debug_defconfig 4 additions, 5 deletionsarch/s390/configs/debug_defconfig
- arch/s390/configs/performance_defconfig 4 additions, 4 deletionsarch/s390/configs/performance_defconfig
- arch/s390/crypto/crc32be-vx.S 4 additions, 1 deletionarch/s390/crypto/crc32be-vx.S
- arch/s390/crypto/crc32le-vx.S 3 additions, 1 deletionarch/s390/crypto/crc32le-vx.S
- arch/s390/include/asm/nospec-insn.h 196 additions, 0 deletionsarch/s390/include/asm/nospec-insn.h
- arch/s390/include/asm/purgatory.h 6 additions, 0 deletionsarch/s390/include/asm/purgatory.h
- arch/s390/kernel/Makefile 1 addition, 0 deletionsarch/s390/kernel/Makefile
- arch/s390/kernel/asm-offsets.c 1 addition, 0 deletionsarch/s390/kernel/asm-offsets.c
- arch/s390/kernel/base.S 14 additions, 10 deletionsarch/s390/kernel/base.S
- arch/s390/kernel/entry.S 24 additions, 81 deletionsarch/s390/kernel/entry.S
- arch/s390/kernel/irq.c 2 additions, 3 deletionsarch/s390/kernel/irq.c
- arch/s390/kernel/mcount.S 9 additions, 5 deletionsarch/s390/kernel/mcount.S
- arch/s390/kernel/nospec-branch.c 20 additions, 24 deletionsarch/s390/kernel/nospec-branch.c
- arch/s390/kernel/nospec-sysfs.c 21 additions, 0 deletionsarch/s390/kernel/nospec-sysfs.c
- arch/s390/kernel/perf_cpum_sf.c 4 additions, 0 deletionsarch/s390/kernel/perf_cpum_sf.c
- arch/s390/kernel/reipl.S 5 additions, 2 deletionsarch/s390/kernel/reipl.S
- arch/s390/kernel/swsusp.S 6 additions, 4 deletionsarch/s390/kernel/swsusp.S
- arch/s390/lib/mem.S 11 additions, 8 deletionsarch/s390/lib/mem.S
- arch/s390/net/bpf_jit.S 10 additions, 6 deletionsarch/s390/net/bpf_jit.S
Loading
Please register or sign in to comment