History

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 committed 6 years ago

Commit c70672d2 parents 09274ae 5c60ed24 files · +9 −1Browse files

Unified · Split

4 files
  1. arch/s390/Kconfig +1 −1
  2. arch/s390/configs/debug_defconfig +4 −0
  3. arch/s390/configs/defconfig +3 −0
  4. arch/s390/configs/zfcpdump_defconfig +1 −0
arch/s390/Kconfig+1−1
@@ -30,7 +30,7 @@ config GENERIC_BUG_RELATIVE_POINTERS · 29 unmodified lines
3030 def_bool y
3131
3232 config GENERIC_LOCKBREAK
33− def_bool y if PREEMPTTION
33+ def_bool y if PREEMPTION
3434
3535 config PGSTE
3636 def_bool y if KVM
arch/s390/configs/debug_defconfig+4−0
@@ -626,6 +626,7 @@ CONFIG_NTFS_RW=y · 625 unmodified lines
626626 CONFIG_PROC_KCORE=y
627627 CONFIG_TMPFS=y
628628 CONFIG_TMPFS_POSIX_ACL=y
629+CONFIG_TMPFS_INODE64=y
629630 CONFIG_HUGETLBFS=y
630631 CONFIG_CONFIGFS_FS=m
631632 CONFIG_ECRYPT_FS=m
@@ -807,6 +808,7 @@ CONFIG_DEBUG_NOTIFIERS=y · 175 unmodified lines
807808 CONFIG_BUG_ON_DATA_CORRUPTION=y
808809 CONFIG_DEBUG_CREDENTIALS=y
809810 CONFIG_RCU_TORTURE_TEST=m
811+CONFIG_RCU_REF_SCALE_TEST=m
810812 CONFIG_RCU_CPU_STALL_TIMEOUT=300
811813 # CONFIG_RCU_TRACE is not set
812814 CONFIG_LATENCYTOP=y
@@ -818,6 +820,7 @@ CONFIG_PREEMPT_TRACER=y · 5 unmodified lines
818820 CONFIG_SCHED_TRACER=y
819821 CONFIG_FTRACE_SYSCALLS=y
820822 CONFIG_BLK_DEV_IO_TRACE=y
823+CONFIG_BPF_KPROBE_OVERRIDE=y
821824 CONFIG_HIST_TRIGGERS=y
822825 CONFIG_S390_PTDUMP=y
823826 CONFIG_NOTIFIER_ERROR_INJECTION=m
@@ -829,6 +832,7 @@ CONFIG_FAIL_MAKE_REQUEST=y · 5 unmodified lines
829832 CONFIG_FAIL_IO_TIMEOUT=y
830833 CONFIG_FAIL_FUTEX=y
831834 CONFIG_FAULT_INJECTION_DEBUG_FS=y
835+CONFIG_FAIL_FUNCTION=y
832836 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
833837 CONFIG_LKDTM=m
834838 CONFIG_TEST_LIST_SORT=y
arch/s390/configs/defconfig+3−0
@@ -617,6 +617,7 @@ CONFIG_NTFS_RW=y · 616 unmodified lines
617617 CONFIG_PROC_KCORE=y
618618 CONFIG_TMPFS=y
619619 CONFIG_TMPFS_POSIX_ACL=y
620+CONFIG_TMPFS_INODE64=y
620621 CONFIG_HUGETLBFS=y
621622 CONFIG_CONFIGFS_FS=m
622623 CONFIG_ECRYPT_FS=m
@@ -763,6 +764,7 @@ CONFIG_PANIC_ON_OOPS=y · 140 unmodified lines
763764 CONFIG_TEST_LOCKUP=m
764765 CONFIG_BUG_ON_DATA_CORRUPTION=y
765766 CONFIG_RCU_TORTURE_TEST=m
767+CONFIG_RCU_REF_SCALE_TEST=m
766768 CONFIG_RCU_CPU_STALL_TIMEOUT=60
767769 CONFIG_LATENCYTOP=y
768770 CONFIG_BOOTTIME_TRACING=y
@@ -771,6 +773,7 @@ CONFIG_STACK_TRACER=y · 2 unmodified lines
771773 CONFIG_SCHED_TRACER=y
772774 CONFIG_FTRACE_SYSCALLS=y
773775 CONFIG_BLK_DEV_IO_TRACE=y
776+CONFIG_BPF_KPROBE_OVERRIDE=y
774777 CONFIG_HIST_TRIGGERS=y
775778 CONFIG_S390_PTDUMP=y
776779 CONFIG_LKDTM=m
arch/s390/configs/zfcpdump_defconfig+1−0
@@ -74,5 +74,6 @@ CONFIG_DEBUG_KERNEL=y · 73 unmodified lines
7474 CONFIG_PANIC_ON_OOPS=y
7575 # CONFIG_SCHED_DEBUG is not set
7676 CONFIG_RCU_CPU_STALL_TIMEOUT=60
77+# CONFIG_RCU_TRACE is not set
7778 # CONFIG_FTRACE is not set
7879 # CONFIG_RUNTIME_TESTING_MENU is not set

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t