Merge remote-tracking branch 'printk/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 3 Jun 2021 00:42:23 +0000 (10:42 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 3 Jun 2021 00:42:23 +0000 (10:42 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 00:42:23 +0000 (10:42 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 00:42:23 +0000 (10:42 +1000)
diff --cc Documentation/core-api/printk-formats.rst
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
diff --cc lib/Makefile
Simple merge
diff --cc lib/test_printf.c
Simple merge
diff --cc lib/vsprintf.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 00:42:23 +0000 (10:42 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 00:42:23 +0000 (10:42 +1000)
		1	2
Documentation/core-api/printk-formats.rst	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/test_printf.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/vsprintf.c	patch \|	diff1 \|	diff2 \|	blob \| history