[linux] 01/01: Follow split of LOCKUP_DETECTOR

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

ukleinek pushed a commit to branch master
in repository linux.

commit 54e36b8166d61e6cd1d57e2fee3e944f1e27934b
Author: Uwe Kleine-König <ukleinek at debian.org>
Date:   Mon Sep 11 10:24:36 2017 +0200

    Follow split of LOCKUP_DETECTOR
    
    The config option LOCKUP_DETECTOR was split upstream in
    05a4a9527931 ("kernel/watchdog: split up config options")
    
    The old setting LOCKUP_DETECTOR=y is equivalent to enabling the soft and
    hard detector now.
---
 debian/config/config      | 3 ++-
 debian/config/hppa/config | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/config/config b/debian/config/config
index dee20ae..910183f 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -6077,7 +6077,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_KCOV is not set
-CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_DETECT_HUNG_TASK=y
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index f7a613e..6f79f09 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -548,7 +548,8 @@ CONFIG_SYSFS_SYSCALL=y
 ## file: lib/Kconfig.debug
 ##
 CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
 
 ##
 ## file: mm/Kconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git