Skip to contentSkip to conversation

watchdog-hardlockup-remove-softlockup-comment-in-touch_nmi_watchdog.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Jun 19, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: watchdog/hardlockup: remove softlockup comment in touch_nmi_watchdog()
has been removed from the -mm tree. Its filename was
watchdog-hardlockup-remove-softlockup-comment-in-touch_nmi_watchdog.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Douglas Anderson <[email protected]>
Subject: watchdog/hardlockup: remove softlockup comment in touch_nmi_watchdog()
Date: Fri, 26 May 2023 18:41:35 -0700

In the patch ("watchdog/hardlockup: add comments to touch_nmi_watchdog()") we adjusted some comments for touch_nmi_watchdog(). The comment about the softlockup had a typo and were also felt to be too obvious. Remove it.

---

 include/linux/nmi.h |    4 ----
 1 file changed, 4 deletions(-)
include/linux/nmi.h renamed from include/linux/nmi.h~watchdog-hardlockup-remove-softlockup-comment-in-touch_nmi_watchdog +0 -4
@@ -140,10 +140,6 @@ static inline void touch_nmi_watchdog(vo
 	 */
 	arch_touch_nmi_watchdog();
 
-	/*
-	 * Touching the hardlock detector implicitly resets the
-	 * softlockup detector too
-	 */
 	touch_softlockup_watchdog();
 }
 

_

Patches currently in -mm which might be from [email protected] are