Merge remote-tracking branch 'kspp/for-next/kspp'

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

Thu, 3 Jun 2021 06:51:13 +0000 (16:51 +1000)

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

Thu, 3 Jun 2021 06:51:13 +0000 (16:51 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 06:51:13 +0000 (16:51 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 06:51:13 +0000 (16:51 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc arch/arm64/include/asm/memory.h
Simple merge
diff --cc arch/x86/boot/Makefile
Simple merge
diff --cc include/linux/compiler.h
Simple merge
diff --cc include/linux/mm.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 06:51:13 +0000 (16:51 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 06:51:13 +0000 (16:51 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/memory.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history