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

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

Wed, 2 Jun 2021 23:20:21 +0000 (09:20 +1000)

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

Wed, 2 Jun 2021 23:20:21 +0000 (09:20 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:20:21 +0000 (09:20 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:20:21 +0000 (09:20 +1000)
diff --cc Makefile
Simple merge
diff --cc arch/riscv/Makefile
Simple merge
diff --cc scripts/Makefile.modfinal
Simple merge
diff --cc scripts/link-vmlinux.sh
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Jun 2021 23:20:21 +0000 (09:20 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Jun 2021 23:20:21 +0000 (09:20 +1000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/riscv/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.modfinal	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/link-vmlinux.sh	patch \|	diff1 \|	diff2 \|	blob \| history