Merge tag 'printk-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jul 2019 19:25:58 +0000 (12:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jul 2019 19:25:58 +0000 (12:25 -0700)
commit7011b7e1b702cc76f9e969b41d9a95969f2aecaa
treed74319f4db45302b6b2ab87b0120eaef6f72a80d
parent9d22167f34305280c5dd57a74c21651da3c23015
parent4ca96aa99f3e1e530f63559c0cc63ae186ecd677
Merge tag 'printk-for-5.3' of git://git./linux/kernel/git/pmladek/printk

Pull printk updates from Petr Mladek:

 - distinguish different legacy clocks again

 - small clean up

* tag 'printk-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  lib/vsprintf: Reinstate printing of legacy clock IDs
  vsprintf: fix data type of variable in string_nocheck()
lib/vsprintf.c