diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-02 07:58:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-02 07:58:11 +0200 |
| commit | aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8 (patch) | |
| tree | 699edc93f7996ef5ede88bf43998af3f582ba592 /config-nodebug | |
| parent | 651697182b0b06fe2c9261ee1902068a95931020 (diff) | |
| parent | 84558c957b3e0cdd17000affcbdbe22301443bfa (diff) | |
| download | kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.tar.gz kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.tar.xz kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.zip | |
merge stabilization branchkernel-4.6.1-300.vanilla.knurd.1.fc24kernel-4.6.1-300.vanilla.knurd.1.fc23kernel-4.6.1-300.vanilla.knurd.1.fc22
Diffstat (limited to 'config-nodebug')
| -rw-r--r-- | config-nodebug | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-nodebug b/config-nodebug index 65e8accd1..5a4319a57 100644 --- a/config-nodebug +++ b/config-nodebug @@ -112,6 +112,7 @@ CONFIG_KDB_CONTINUE_CATASTROPHIC=0 # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +# CONFIG_WQ_WATCHDOG is not set # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set @@ -126,4 +127,4 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y # CONFIG_SPI_DEBUG is not set -# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set +# CONFIG_DEBUG_VM_PGFLAGS is not set |