The patch titled
Subject: watchdog-split-up-config-options-fix
has been added to the -mm tree. Its filename is
watchdog-split-up-config-options-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/watchdog-split-up-config-options-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/watchdog-split-up-config-options-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Nicholas Piggin <npiggin@xxxxxxxxx>
Subject: watchdog-split-up-config-options-fix
Link: http://lkml.kernel.org/r/20170617223522.66c0ad88@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/Kconfig | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff -puN arch/Kconfig~watchdog-split-up-config-options-fix arch/Kconfig
--- a/arch/Kconfig~watchdog-split-up-config-options-fix
+++ a/arch/Kconfig
@@ -198,9 +198,6 @@ config HAVE_KPROBES_ON_FTRACE
config HAVE_NMI
bool
-config HAVE_NMI_WATCHDOG
- depends on HAVE_NMI
- bool
#
# An arch should select this if it provides all these things:
#
@@ -288,7 +285,6 @@ config HAVE_PERF_EVENTS_NMI
subsystem. Also has support for calculating CPU cycle events
to determine how many clock cycles in a given period.
-
config HAVE_HARDLOCKUP_DETECTOR_PERF
bool
depends on HAVE_PERF_EVENTS_NMI
@@ -297,6 +293,7 @@ config HAVE_HARDLOCKUP_DETECTOR_PERF
detector. Must define HAVE_PERF_EVENTS_NMI.
config HAVE_NMI_WATCHDOG
+ depends on HAVE_NMI
bool
help
The arch provides a low level NMI watchdog. It provides
@@ -310,7 +307,6 @@ config HAVE_HARDLOCKUP_DETECTOR_ARCH
a superset of the HAVE_NMI_WATCHDOG. It also conforms to config
interfaces and parameters provided by hardlockup detector subsystem.
-
config HAVE_PERF_REGS
bool
help
_
Patches currently in -mm which might be from npiggin@xxxxxxxxx are
watchdog-remove-unused-declaration.patch
watchdog-introduce-arch_touch_nmi_watchdog.patch
watchdog-split-up-config-options.patch
watchdog-split-up-config-options-fix.patch
watchdog-provide-watchdog_reconfigure-for-arch-watchdogs.patch
watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix.patch
powerpc-64s-implement-arch-specific-hardlockup-watchdog.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
