Merge branch 'for-5.10-pr_cont-fixup' into for-linus

739e7116 · Petr Mladek · 90574a9c · 4ad9921a · 739e7116
Commit 739e7116 authored Nov 27, 2020 by Petr Mladek
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

kernel/printk/printk.c kernel/printk/printk.c +2 -2

No files found.
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -528,8 +528,8 @@ static int log_store(u32 caller_id, int facility, int level,
 	if (dev_info)
 		memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info));
-	/* insert message */
+	/* A message without a trailing newline can be continued. */
-	if ((flags & LOG_CONT) || !(flags & LOG_NEWLINE))
+	if (!(flags & LOG_NEWLINE))
 		prb_commit(&e);
 	else
 		prb_final_commit(&e);