diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:07:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:07:58 +0200 |
| commit | 9b0dd49e3565ddc71346ba7d57079ee6233d0780 (patch) | |
| tree | 1da29301348a4586351ead3443513816fcc19819 /arch/s390/configs/performance_defconfig | |
| parent | 3112fdde68fa4a3b0b3a3a738f9f32b4d62fdf05 (diff) | |
| parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
| download | linux-9b0dd49e3565ddc71346ba7d57079ee6233d0780.tar.bz2 | |
Merge 4.8-rc5 into usb-testing
We want the USB fixes in here for testing and merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/configs/performance_defconfig')
| -rw-r--r-- | arch/s390/configs/performance_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig index a5c1e5f2a0ca..1751446a5bbb 100644 --- a/arch/s390/configs/performance_defconfig +++ b/arch/s390/configs/performance_defconfig @@ -549,7 +549,6 @@ CONFIG_TIMER_STATS=y CONFIG_RCU_TORTURE_TEST=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_LATENCYTOP=y -CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_STACK_TRACER=y |