Merge remote-tracking branch 'sparc/master' into work.sparc32
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 4 Jan 2021 01:05:34 +0000 (20:05 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 4 Jan 2021 01:07:31 +0000 (20:07 -0500)
commit73686e787b495a85551e2e99c459adde6836eb31
tree2b26a24240f11442f326da096f2e824a68252674
parentb4edf06c8aaae30ef926bd6853df6e59a7579ee9
parent0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab
Merge remote-tracking branch 'sparc/master' into work.sparc32

... and resolve a non-textual conflict in arch/sparc/lib/memset.S -
EXT(...) stuff shouldn't be reintroduced on merge.
arch/sparc/Kconfig
arch/sparc/mm/srmmu.c