Merge branch 'for-5.11' into for-linus

author Petr Mladek <pmladek@suse.com>

Mon, 14 Dec 2020 14:15:07 +0000 (15:15 +0100)

committer Petr Mladek <pmladek@suse.com>

Mon, 14 Dec 2020 14:15:07 +0000 (15:15 +0100)
author Petr Mladek <pmladek@suse.com>
Mon, 14 Dec 2020 14:15:07 +0000 (15:15 +0100)
committer Petr Mladek <pmladek@suse.com>
Mon, 14 Dec 2020 14:15:07 +0000 (15:15 +0100)
diff --cc kernel/printk/printk.c
Simple merge
diff --cc kernel/printk/printk_ringbuffer.c
Simple merge
author	Petr Mladek <pmladek@suse.com>
	Mon, 14 Dec 2020 14:15:07 +0000 (15:15 +0100)
committer	Petr Mladek <pmladek@suse.com>
	Mon, 14 Dec 2020 14:15:07 +0000 (15:15 +0100)
		1	2
kernel/printk/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk/printk_ringbuffer.c	patch \|	diff1 \|	diff2 \|	blob \| history