The patch titled Subject: watchdog-split-up-config-options-fix has been removed from the -mm tree. Its filename was watchdog-split-up-config-options-fix.patch This patch was dropped because it was folded into watchdog-split-up-config-options.patch ------------------------------------------------------ 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-provide-watchdog_reconfigure-for-arch-watchdogs.patch watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix.patch powerpc-64s-implement-arch-specific-hardlockup-watchdog.patch powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix.patch powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix-2.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