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
30 def_bool y30 def_bool y
31 31
32config GENERIC_LOCKBREAK32config GENERIC_LOCKBREAK
33 def_bool y if PREEMPTTION33 def_bool y if PREEMPTION
34 34
35config PGSTE35config PGSTE
36 def_bool y if KVM36 def_bool y if KVM
arch/s390/configs/debug_defconfig+4−0
@@ -626,6 +626,7 @@ CONFIG_NTFS_RW=y · 625 unmodified lines
626CONFIG_PROC_KCORE=y626CONFIG_PROC_KCORE=y
627CONFIG_TMPFS=y627CONFIG_TMPFS=y
628CONFIG_TMPFS_POSIX_ACL=y628CONFIG_TMPFS_POSIX_ACL=y
629CONFIG_TMPFS_INODE64=y
629CONFIG_HUGETLBFS=y630CONFIG_HUGETLBFS=y
630CONFIG_CONFIGFS_FS=m631CONFIG_CONFIGFS_FS=m
631CONFIG_ECRYPT_FS=m632CONFIG_ECRYPT_FS=m
@@ -807,6 +808,7 @@ CONFIG_DEBUG_NOTIFIERS=y · 175 unmodified lines
807CONFIG_BUG_ON_DATA_CORRUPTION=y808CONFIG_BUG_ON_DATA_CORRUPTION=y
808CONFIG_DEBUG_CREDENTIALS=y809CONFIG_DEBUG_CREDENTIALS=y
809CONFIG_RCU_TORTURE_TEST=m810CONFIG_RCU_TORTURE_TEST=m
811CONFIG_RCU_REF_SCALE_TEST=m
810CONFIG_RCU_CPU_STALL_TIMEOUT=300812CONFIG_RCU_CPU_STALL_TIMEOUT=300
811# CONFIG_RCU_TRACE is not set813# CONFIG_RCU_TRACE is not set
812CONFIG_LATENCYTOP=y814CONFIG_LATENCYTOP=y
@@ -818,6 +820,7 @@ CONFIG_PREEMPT_TRACER=y · 5 unmodified lines
818CONFIG_SCHED_TRACER=y820CONFIG_SCHED_TRACER=y
819CONFIG_FTRACE_SYSCALLS=y821CONFIG_FTRACE_SYSCALLS=y
820CONFIG_BLK_DEV_IO_TRACE=y822CONFIG_BLK_DEV_IO_TRACE=y
823CONFIG_BPF_KPROBE_OVERRIDE=y
821CONFIG_HIST_TRIGGERS=y824CONFIG_HIST_TRIGGERS=y
822CONFIG_S390_PTDUMP=y825CONFIG_S390_PTDUMP=y
823CONFIG_NOTIFIER_ERROR_INJECTION=m826CONFIG_NOTIFIER_ERROR_INJECTION=m
@@ -829,6 +832,7 @@ CONFIG_FAIL_MAKE_REQUEST=y · 5 unmodified lines
829CONFIG_FAIL_IO_TIMEOUT=y832CONFIG_FAIL_IO_TIMEOUT=y
830CONFIG_FAIL_FUTEX=y833CONFIG_FAIL_FUTEX=y
831CONFIG_FAULT_INJECTION_DEBUG_FS=y834CONFIG_FAULT_INJECTION_DEBUG_FS=y
835CONFIG_FAIL_FUNCTION=y
832CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y836CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
833CONFIG_LKDTM=m837CONFIG_LKDTM=m
834CONFIG_TEST_LIST_SORT=y838CONFIG_TEST_LIST_SORT=y
arch/s390/configs/defconfig+3−0
@@ -617,6 +617,7 @@ CONFIG_NTFS_RW=y · 616 unmodified lines
617CONFIG_PROC_KCORE=y617CONFIG_PROC_KCORE=y
618CONFIG_TMPFS=y618CONFIG_TMPFS=y
619CONFIG_TMPFS_POSIX_ACL=y619CONFIG_TMPFS_POSIX_ACL=y
620CONFIG_TMPFS_INODE64=y
620CONFIG_HUGETLBFS=y621CONFIG_HUGETLBFS=y
621CONFIG_CONFIGFS_FS=m622CONFIG_CONFIGFS_FS=m
622CONFIG_ECRYPT_FS=m623CONFIG_ECRYPT_FS=m
@@ -763,6 +764,7 @@ CONFIG_PANIC_ON_OOPS=y · 140 unmodified lines
763CONFIG_TEST_LOCKUP=m764CONFIG_TEST_LOCKUP=m
764CONFIG_BUG_ON_DATA_CORRUPTION=y765CONFIG_BUG_ON_DATA_CORRUPTION=y
765CONFIG_RCU_TORTURE_TEST=m766CONFIG_RCU_TORTURE_TEST=m
767CONFIG_RCU_REF_SCALE_TEST=m
766CONFIG_RCU_CPU_STALL_TIMEOUT=60768CONFIG_RCU_CPU_STALL_TIMEOUT=60
767CONFIG_LATENCYTOP=y769CONFIG_LATENCYTOP=y
768CONFIG_BOOTTIME_TRACING=y770CONFIG_BOOTTIME_TRACING=y
@@ -771,6 +773,7 @@ CONFIG_STACK_TRACER=y · 2 unmodified lines
771CONFIG_SCHED_TRACER=y773CONFIG_SCHED_TRACER=y
772CONFIG_FTRACE_SYSCALLS=y774CONFIG_FTRACE_SYSCALLS=y
773CONFIG_BLK_DEV_IO_TRACE=y775CONFIG_BLK_DEV_IO_TRACE=y
776CONFIG_BPF_KPROBE_OVERRIDE=y
774CONFIG_HIST_TRIGGERS=y777CONFIG_HIST_TRIGGERS=y
775CONFIG_S390_PTDUMP=y778CONFIG_S390_PTDUMP=y
776CONFIG_LKDTM=m779CONFIG_LKDTM=m
arch/s390/configs/zfcpdump_defconfig+1−0
@@ -74,5 +74,6 @@ CONFIG_DEBUG_KERNEL=y · 73 unmodified lines
74CONFIG_PANIC_ON_OOPS=y74CONFIG_PANIC_ON_OOPS=y
75# CONFIG_SCHED_DEBUG is not set75# CONFIG_SCHED_DEBUG is not set
76CONFIG_RCU_CPU_STALL_TIMEOUT=6076CONFIG_RCU_CPU_STALL_TIMEOUT=60
77# CONFIG_RCU_TRACE is not set
77# CONFIG_FTRACE is not set78# CONFIG_FTRACE is not set
78# CONFIG_RUNTIME_TESTING_MENU is not set79# 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