The patch titled
Subject: watchdog-hardlockup-add-comments-to-touch_nmi_watchdog-fix
has been added to the -mm mm-nonmm-unstable branch. Its filename is
watchdog-hardlockup-add-comments-to-touch_nmi_watchdog-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/watchdog-hardlockup-add-comments-to-touch_nmi_watchdog-fix.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
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/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: watchdog-hardlockup-add-comments-to-touch_nmi_watchdog-fix
Date: Fri Jun 9 04:37:30 PM PDT 2023
comment changes, per Petr
Link: https://lkml.kernel.org/r/ZGyONWPXpE1DcxA5@alley
Cc: Petr Mladek <pmladek@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/nmi.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/include/linux/nmi.h~watchdog-hardlockup-add-comments-to-touch_nmi_watchdog-fix
+++ a/include/linux/nmi.h
@@ -125,7 +125,7 @@ void watchdog_nmi_disable(unsigned int c
void lockup_detector_reconfigure(void);
/**
- * touch_nmi_watchdog - manually pet the hardlockup watchdog.
+ * touch_nmi_watchdog - manually reset the hardlockup watchdog timeout.
*
* If we support detecting hardlockups, touch_nmi_watchdog() may be
* used to pet the watchdog (reset the timeout) - for code which
@@ -146,7 +146,7 @@ static inline void touch_nmi_watchdog(vo
arch_touch_nmi_watchdog();
/*
- * Touching the hardlock detector implcitily pets the
+ * Touching the hardlock detector implicitly resets the
* softlockup detector too
*/
touch_softlockup_watchdog();
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix.patch
mm-page_owner-add-page_owner_stacks-file-to-print-out-only-stacks-and-their-counte-fix.patch
mm-page_owner-add-page_owner_stacks-file-to-print-out-only-stacks-and-their-counte-fix-fix.patch
mmpage_owner-filter-out-stacks-by-a-threshold-counter-fix.patch
mm-page_isolation-write-proper-kerneldoc-fix.patch
mm-hugetlb-use-a-folio-in-hugetlb_fault-fix.patch
fork-optimize-memcg_charge_kernel_stack-a-bit-fix.patch
squashfs-cache-partial-compressed-blocks-fix.patch
squashfs-cache-partial-compressed-blocks-fix-3-fix.patch
init-add-bdev-fs-printk-if-mount_block_root-failed-fix.patch
watchdog-hardlockup-add-comments-to-touch_nmi_watchdog-fix.patch
kexec-add-helper-__crash_shrink_memory-fix.patch
