From d0b70c70ab0c00a2dac94545fa95ec43180c0c4a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 27 Jul 2022 16:45:27 +0200 Subject: [PATCH] 5.15-stable patches added patches: watch-queue-remove-spurious-double-semicolon.patch --- queue-5.15/series | 1 + ...eue-remove-spurious-double-semicolon.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 queue-5.15/watch-queue-remove-spurious-double-semicolon.patch diff --git a/queue-5.15/series b/queue-5.15/series index 9ae6a118d80..0381ccd24f4 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -191,3 +191,4 @@ tty-drop-tty_schedule_flip.patch tty-extract-tty_flip_buffer_commit-from-tty_flip_buffer_push.patch tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch net-usb-ax88179_178a-needs-flag_send_zlp.patch +watch-queue-remove-spurious-double-semicolon.patch diff --git a/queue-5.15/watch-queue-remove-spurious-double-semicolon.patch b/queue-5.15/watch-queue-remove-spurious-double-semicolon.patch new file mode 100644 index 00000000000..eb8a3703737 --- /dev/null +++ b/queue-5.15/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); + } + } + -- 2.47.3