Merge tag 's390-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Heiko Carstens: - fix / add expoline usage in "DMA" code - fix compat vdso Makefile to avoid permanent rebuild - fix ftrace_update_ftrace_func to avoid NULL pointer dereference - update defconfigs - trivial coding style fix * tag 's390-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: update defconfigs s390/cpumf: fix semicolon.cocci warnings s390/boot: fix use of expolines in the DMA code s390/ftrace: fix ftrace_update_ftrace_func implementation s390/defconfig: allow early device mapper disks s390/vdso32: add vdso32.lds to targets
Showing
- arch/s390/boot/text_dma.S 4 additions, 15 deletionsarch/s390/boot/text_dma.S
- arch/s390/configs/debug_defconfig 18 additions, 9 deletionsarch/s390/configs/debug_defconfig
- arch/s390/configs/defconfig 19 additions, 8 deletionsarch/s390/configs/defconfig
- arch/s390/configs/zfcpdump_defconfig 1 addition, 2 deletionsarch/s390/configs/zfcpdump_defconfig
- arch/s390/include/asm/ftrace.h 1 addition, 0 deletionsarch/s390/include/asm/ftrace.h
- arch/s390/kernel/ftrace.c 2 additions, 0 deletionsarch/s390/kernel/ftrace.c
- arch/s390/kernel/mcount.S 2 additions, 2 deletionsarch/s390/kernel/mcount.S
- arch/s390/kernel/perf_cpum_cf.c 1 addition, 1 deletionarch/s390/kernel/perf_cpum_cf.c
- arch/s390/kernel/vdso32/Makefile 1 addition, 0 deletionsarch/s390/kernel/vdso32/Makefile
Loading
Please register or sign in to comment