tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

- Fix GENERIC_LOCKBREAK dependency on PREEMPTION in Kconfig broken
because of a typo

- Update defconfigs

* tag 's390-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: update defconfigs
s390: fix GENERIC_LOCKBREAK dependency typo in Kconfig

Linus Torvalds c70672d8 09274aed

+9 -1
+1 -1
arch/s390/Kconfig
··· 30 30 def_bool y 31 31 32 32 config GENERIC_LOCKBREAK 33 - def_bool y if PREEMPTTION 33 + def_bool y if PREEMPTION 34 34 35 35 config PGSTE 36 36 def_bool y if KVM
+4
arch/s390/configs/debug_defconfig
··· 626 626 CONFIG_PROC_KCORE=y 627 627 CONFIG_TMPFS=y 628 628 CONFIG_TMPFS_POSIX_ACL=y 629 + CONFIG_TMPFS_INODE64=y 629 630 CONFIG_HUGETLBFS=y 630 631 CONFIG_CONFIGFS_FS=m 631 632 CONFIG_ECRYPT_FS=m ··· 808 807 CONFIG_BUG_ON_DATA_CORRUPTION=y 809 808 CONFIG_DEBUG_CREDENTIALS=y 810 809 CONFIG_RCU_TORTURE_TEST=m 810 + CONFIG_RCU_REF_SCALE_TEST=m 811 811 CONFIG_RCU_CPU_STALL_TIMEOUT=300 812 812 # CONFIG_RCU_TRACE is not set 813 813 CONFIG_LATENCYTOP=y ··· 820 818 CONFIG_SCHED_TRACER=y 821 819 CONFIG_FTRACE_SYSCALLS=y 822 820 CONFIG_BLK_DEV_IO_TRACE=y 821 + CONFIG_BPF_KPROBE_OVERRIDE=y 823 822 CONFIG_HIST_TRIGGERS=y 824 823 CONFIG_S390_PTDUMP=y 825 824 CONFIG_NOTIFIER_ERROR_INJECTION=m ··· 832 829 CONFIG_FAIL_IO_TIMEOUT=y 833 830 CONFIG_FAIL_FUTEX=y 834 831 CONFIG_FAULT_INJECTION_DEBUG_FS=y 832 + CONFIG_FAIL_FUNCTION=y 835 833 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 836 834 CONFIG_LKDTM=m 837 835 CONFIG_TEST_LIST_SORT=y
+3
arch/s390/configs/defconfig
··· 617 617 CONFIG_PROC_KCORE=y 618 618 CONFIG_TMPFS=y 619 619 CONFIG_TMPFS_POSIX_ACL=y 620 + CONFIG_TMPFS_INODE64=y 620 621 CONFIG_HUGETLBFS=y 621 622 CONFIG_CONFIGFS_FS=m 622 623 CONFIG_ECRYPT_FS=m ··· 764 763 CONFIG_TEST_LOCKUP=m 765 764 CONFIG_BUG_ON_DATA_CORRUPTION=y 766 765 CONFIG_RCU_TORTURE_TEST=m 766 + CONFIG_RCU_REF_SCALE_TEST=m 767 767 CONFIG_RCU_CPU_STALL_TIMEOUT=60 768 768 CONFIG_LATENCYTOP=y 769 769 CONFIG_BOOTTIME_TRACING=y ··· 773 771 CONFIG_SCHED_TRACER=y 774 772 CONFIG_FTRACE_SYSCALLS=y 775 773 CONFIG_BLK_DEV_IO_TRACE=y 774 + CONFIG_BPF_KPROBE_OVERRIDE=y 776 775 CONFIG_HIST_TRIGGERS=y 777 776 CONFIG_S390_PTDUMP=y 778 777 CONFIG_LKDTM=m
+1
arch/s390/configs/zfcpdump_defconfig
··· 74 74 CONFIG_PANIC_ON_OOPS=y 75 75 # CONFIG_SCHED_DEBUG is not set 76 76 CONFIG_RCU_CPU_STALL_TIMEOUT=60 77 + # CONFIG_RCU_TRACE is not set 77 78 # CONFIG_FTRACE is not set 78 79 # CONFIG_RUNTIME_TESTING_MENU is not set