Skip to content

Commit 739e711

Browse files
committed
Merge branch 'for-5.10-pr_cont-fixup' into for-linus
2 parents 90574a9 + 4ad9921 commit 739e711

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/printk/printk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,8 @@ static int log_store(u32 caller_id, int facility, int level,
528528
if (dev_info)
529529
memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info));
530530

531-
/* insert message */
532-
if ((flags & LOG_CONT) || !(flags & LOG_NEWLINE))
531+
/* A message without a trailing newline can be continued. */
532+
if (!(flags & LOG_NEWLINE))
533533
prb_commit(&e);
534534
else
535535
prb_final_commit(&e);

0 commit comments

Comments
 (0)