From: Petr Mladek <pmladek@suse.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>,
Steven Rostedt <rostedt@goodmis.org>,
John Ogness <john.ogness@linutronix.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org
Subject: [GIT PULL] printk for 5.14
Date: Tue, 29 Jun 2021 15:34:50 +0200 [thread overview]
Message-ID: <YNshegt/DQV1JDc9@alley> (raw)
Linus,
please pull the latest printk changes from
git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git tags/printk-for-5.14
=====================================
- Add %pt[RT]s modifier to vsprintf(). It overrides ISO 8601 separator by
using ' ' (space). It produces "YYYY-mm-dd HH:MM:SS" instead of
"YYYY-mm-ddTHH:MM:SS".
- Correctly parse long row of numbers by sscanf() when using the field
width. Add extensive sscanf() selftest.
- Generalize re-entrant CPU lock that has already been used to serialize
dump_stack() output. It is part of the ongoing printk rework. It will
allow to remove the obsoleted printk_safe buffers and introduce atomic
consoles.
- Some code clean up and sparse warning fix.
======================================
Conflict with Andrew's -mm tree:
The commit generalizing the CPU lock conflicts with a patch that
introduces dump_stack_lvl(log_lvl). The resulting code is simple.
But the 3-way merge combined the hunks a messy way here.
A sample resolution can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git origin/for-5.14-mm-dump_stack-loglvl-conflict
----------------------------------------------------------------
Andy Shevchenko (4):
lib/vsprintf: Allow to override ISO 8601 date and time separator
kdb: Switch to use %ptTs
nilfs2: Switch to use %ptTs
usb: host: xhci-tegra: Switch to use %ptTs
Huilong Deng (1):
printk: Remove trailing semicolon in macros
John Ogness (2):
lib/dump_stack: move cpu lock to printk.c
printk: fix cpu lock ordering
Petr Mladek (3):
Merge branch 'for-5.14-vsprintf-pts' into for-linus
Merge branch 'for-5.14-vsprintf-scanf' into for-linus
Merge branch 'printk-rework' into for-linus
Richard Fitzgerald (6):
lib: vsprintf: scanf: Negative number must have field width > 1
lib: vsprintf: Fix handling of number field widths in vsscanf
lib: test_scanf: Add tests for sscanf number conversion
selftests: lib: Add wrapper script for test_scanf
lib: test_scanf: Remove pointless use of type_min() with unsigned types
random32: Fix implicit truncation warning in prandom_seed_state()
Documentation/core-api/printk-formats.rst | 7 +-
MAINTAINERS | 1 +
drivers/usb/host/xhci-tegra.c | 6 +-
fs/nilfs2/sysfs.c | 19 +-
include/linux/dev_printk.h | 2 +-
include/linux/prandom.h | 2 +-
include/linux/printk.h | 41 ++
kernel/debug/kdb/kdb_main.c | 9 +-
kernel/printk/printk.c | 116 +++++
lib/Kconfig.debug | 3 +
lib/Makefile | 1 +
lib/dump_stack.c | 38 +-
lib/kstrtox.c | 13 +-
lib/kstrtox.h | 2 +
lib/test_printf.c | 5 +
lib/test_scanf.c | 750 ++++++++++++++++++++++++++++++
lib/vsprintf.c | 110 +++--
tools/testing/selftests/lib/Makefile | 2 +-
tools/testing/selftests/lib/config | 1 +
tools/testing/selftests/lib/scanf.sh | 4 +
20 files changed, 1020 insertions(+), 112 deletions(-)
create mode 100644 lib/test_scanf.c
create mode 100755 tools/testing/selftests/lib/scanf.sh
next reply other threads:[~2021-06-29 13:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 13:34 Petr Mladek [this message]
2021-06-29 19:57 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YNshegt/DQV1JDc9@alley \
--to=pmladek@suse.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=senozhatsky@chromium.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®