mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
Merge branch 'for-5.10-pr_cont-fixup' into for-linus
This commit is contained in:
commit
739e7116b1
1 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue