Merge branch 'printk-rework' into for-linus

author Petr Mladek <pmladek@suse.com>

Thu, 21 Jan 2021 15:06:21 +0000 (16:06 +0100)

committer Petr Mladek <pmladek@suse.com>

Thu, 21 Jan 2021 15:06:21 +0000 (16:06 +0100)
author Petr Mladek <pmladek@suse.com>
Thu, 21 Jan 2021 15:06:21 +0000 (16:06 +0100)
committer Petr Mladek <pmladek@suse.com>
Thu, 21 Jan 2021 15:06:21 +0000 (16:06 +0100)
diff --cc kernel/printk/printk.c
Simple merge
diff --cc kernel/printk/printk_ringbuffer.c
Simple merge
author	Petr Mladek <pmladek@suse.com>
	Thu, 21 Jan 2021 15:06:21 +0000 (16:06 +0100)
committer	Petr Mladek <pmladek@suse.com>
	Thu, 21 Jan 2021 15:06:21 +0000 (16:06 +0100)
		1	2
kernel/printk/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk/printk_ringbuffer.c	patch \|	diff1 \|	diff2 \|	blob \| history