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

jix · Nov 27, 2020 · 739e711 · 739e711
2 parents 90574a9 + 4ad9921
commit 739e711
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 */
-	if ((flags & LOG_CONT) || !(flags & LOG_NEWLINE))
+	/* A message without a trailing newline can be continued. */
+	if (!(flags & LOG_NEWLINE))
 		prb_commit(&e);
 	else
 		prb_final_commit(&e);