Merge remote-tracking branch 'sparc/master' into work.sparc32

author Al Viro <[email protected]>

Mon, 4 Jan 2021 01:05:34 +0000 (20:05 -0500)

committer Al Viro <[email protected]>

Mon, 4 Jan 2021 01:07:31 +0000 (20:07 -0500)
author Al Viro <[email protected]>
Mon, 4 Jan 2021 01:05:34 +0000 (20:05 -0500)
committer Al Viro <[email protected]>
Mon, 4 Jan 2021 01:07:31 +0000 (20:07 -0500)
diff --cc arch/sparc/Kconfig
Simple merge
diff --cc arch/sparc/mm/srmmu.c
Simple merge
author	Al Viro <[email protected]>
	Mon, 4 Jan 2021 01:05:34 +0000 (20:05 -0500)
committer	Al Viro <[email protected]>
	Mon, 4 Jan 2021 01:07:31 +0000 (20:07 -0500)
		1	2
arch/sparc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sparc/mm/srmmu.c	patch \|	diff1 \|	diff2 \|	blob \| history