Merge branch 'for-5.11-null-console' into for-linus

author Petr Mladek <[email protected]>

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

committer Petr Mladek <[email protected]>

Mon, 14 Dec 2020 14:14:57 +0000 (15:14 +0100)
author Petr Mladek <[email protected]>
Mon, 14 Dec 2020 14:14:57 +0000 (15:14 +0100)
committer Petr Mladek <[email protected]>
Mon, 14 Dec 2020 14:14:57 +0000 (15:14 +0100)
diff --cc init/main.c
Simple merge
diff --cc kernel/printk/printk.c
Simple merge
author	Petr Mladek <[email protected]>
	Mon, 14 Dec 2020 14:14:57 +0000 (15:14 +0100)
committer	Petr Mladek <[email protected]>
	Mon, 14 Dec 2020 14:14:57 +0000 (15:14 +0100)
		1	2
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history