Merge 5.12-rc6 into driver-core-next

author Greg Kroah-Hartman <[email protected]>

Mon, 5 Apr 2021 06:51:37 +0000 (08:51 +0200)

committer Greg Kroah-Hartman <[email protected]>

Mon, 5 Apr 2021 06:51:37 +0000 (08:51 +0200)
author Greg Kroah-Hartman <[email protected]>
Mon, 5 Apr 2021 06:51:37 +0000 (08:51 +0200)
committer Greg Kroah-Hartman <[email protected]>
Mon, 5 Apr 2021 06:51:37 +0000 (08:51 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/base/dd.c
Simple merge
author	Greg Kroah-Hartman <[email protected]>
	Mon, 5 Apr 2021 06:51:37 +0000 (08:51 +0200)
committer	Greg Kroah-Hartman <[email protected]>
	Mon, 5 Apr 2021 06:51:37 +0000 (08:51 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/base/dd.c	patch \|	diff1 \|	diff2 \|	blob \| history