[folded-merged] watchdog-allow-nmi-watchdog-to-use-raw-perf-event-fix.patch removed from -mm tree

[folded-merged] watchdog-allow-nmi-watchdog-to-use-raw-perf-event-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: watchdog-allow-nmi-watchdog-to-use-raw-perf-event-fix
has been removed from the -mm tree.  Its filename was
     watchdog-allow-nmi-watchdog-to-use-raw-perf-event-fix.patch

This patch was dropped because it was folded into watchdog-allow-nmi-watchdog-to-use-raw-perf-event.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: watchdog-allow-nmi-watchdog-to-use-raw-perf-event-fix
Date: Sat May  4 03:39:48 PM PDT 2024

fix kerneldoc

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202405040851.2EgypmL1-lkp@intel.com/ 
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <song@kernel.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/watchdog_perf.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/kernel/watchdog_perf.c~watchdog-allow-nmi-watchdog-to-use-raw-perf-event-fix
+++ a/kernel/watchdog_perf.c
@@ -277,6 +277,8 @@ int __init watchdog_hardlockup_probe(voi
 
 /**
  * hardlockup_config_perf_event - Overwrite config of wd_hw_attr.
+ *
+ * @str: number which identifies the raw perf event to use
  */
 void __init hardlockup_config_perf_event(const char *str)
 {
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-memory-failure-send-sigbus-in-the-event-of-thp-split-fail-fix.patch
__mod_memcg_lruvec_state-enhance-diagnostics.patch
__mod_memcg_lruvec_state-enhance-diagnostics-fix.patch
watchdog-allow-nmi-watchdog-to-use-raw-perf-event.patch
kernel-watchdog_perfc-tidy-up-kerneldoc.patch