Commit 739e7116 authored by Petr Mladek's avatar Petr Mladek
Browse files

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

parents 90574a9c 4ad9921a

kernel/printk/printk.c

+2 −2
Original line number Diff line number Diff line
@@ -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);