From: Greg Kroah-Hartman Date: Wed, 27 Jul 2022 14:45:33 +0000 (+0200) Subject: 5.18-stable patches X-Git-Tag: v4.9.325~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3259182f9f62ec6e569b8b7ea1c72d19e164a09;p=thirdparty%2Fkernel%2Fstable-queue.git 5.18-stable patches added patches: watch-queue-remove-spurious-double-semicolon.patch --- diff --git a/queue-5.18/series b/queue-5.18/series index 802239fa3d4..c8b6221c17f 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -155,3 +155,4 @@ watchqueue-make-sure-to-serialize-wqueue-defunct-properly.patch asoc-sof-pm-add-explicit-behavior-for-acpi-s1-and-s2.patch asoc-sof-pm-add-definitions-for-s4-and-s5-states.patch asoc-sof-intel-disable-imr-boot-when-resuming-from-acpi-s4-and-s5-states.patch +watch-queue-remove-spurious-double-semicolon.patch diff --git a/queue-5.18/watch-queue-remove-spurious-double-semicolon.patch b/queue-5.18/watch-queue-remove-spurious-double-semicolon.patch new file mode 100644 index 00000000000..eb8a3703737 --- /dev/null +++ b/queue-5.18/watch-queue-remove-spurious-double-semicolon.patch @@ -0,0 +1,36 @@ +From 44e29e64cf1ac0cffb152e0532227ea6d002aa28 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Thu, 21 Jul 2022 10:30:14 -0700 +Subject: watch-queue: remove spurious double semicolon + +From: Linus Torvalds + +commit 44e29e64cf1ac0cffb152e0532227ea6d002aa28 upstream. + +Sedat Dilek noticed that I had an extraneous semicolon at the end of a +line in the previous patch. + +It's harmless, but unintentional, and while compilers just treat it as +an extra empty statement, for all I know some other tooling might warn +about it. So clean it up before other people notice too ;) + +Fixes: 353f7988dd84 ("watchqueue: make sure to serialize 'wqueue->defunct' properly") +Reported-by: Sedat Dilek +Signed-off-by: Linus Torvalds +Reported-by: Sedat Dilek +Signed-off-by: Greg Kroah-Hartman +--- + kernel/watch_queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/watch_queue.c ++++ b/kernel/watch_queue.c +@@ -227,7 +227,7 @@ void __post_watch_notification(struct wa + + if (lock_wqueue(wqueue)) { + post_one_notification(wqueue, n); +- unlock_wqueue(wqueue);; ++ unlock_wqueue(wqueue); + } + } +