diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-09 20:22:42 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-09 20:22:42 +0300 |
| commit | c4703acd6d4a58dc4b31ad2a8f8b14becb898d25 (patch) | |
| tree | 722bea1c4e9dc4230e7a2828a52fb4d5a55214b3 /lib/vsprintf.c | |
| parent | a448c643bc49f14bb3aae68ee7085b4c7f6207d8 (diff) | |
| parent | 943ca6ad81e5b37bd5d22cbab5ad06dc97fc001c (diff) | |
| download | linux-c4703acd6d4a58dc4b31ad2a8f8b14becb898d25.tar.xz | |
Merge tag 'printk-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk updates from Petr Mladek:
- Allow to sort mixed lines by an extra information about the caller
- Remove no longer used LOG_PREFIX.
- Some clean up and documentation update.
* tag 'printk-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
printk/docs: Add extra integer types to printk-formats
printk: Remove no longer used LOG_PREFIX.
lib/vsprintf: Remove %pCr remnant in comment
printk: Pass caller information to log_store().
printk: Add caller information to printk() output.
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 30b00de4f321..791b6fa36905 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1931,7 +1931,6 @@ char *device_node_string(char *buf, char *end, struct device_node *dn, * (legacy clock framework) of the clock * - 'Cn' For a clock, it prints the name (Common Clock Framework) or address * (legacy clock framework) of the clock - * - 'Cr' For a clock, it prints the current rate of the clock * - 'G' For flags to be printed as a collection of symbolic strings that would * construct the specific value. Supported flags given by option: * p page flags (see struct page) given as pointer to unsigned long |