Merge remote-tracking branch 'integrity/next-integrity'

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

Wed, 14 Apr 2021 04:33:51 +0000 (14:33 +1000)

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

Wed, 14 Apr 2021 04:33:51 +0000 (14:33 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 04:33:51 +0000 (14:33 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 04:33:51 +0000 (14:33 +1000)
diff --cc Makefile
Simple merge
diff --cc init/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 04:33:51 +0000 (14:33 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 04:33:51 +0000 (14:33 +1000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history