]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8651ca8dd4bb40e0c33ff6e943625531f18e1bf2
tree2b26a24240f11442f326da096f2e824a68252674
parentdeb9725e75d89f1690b71046e9a791445dbb61fd
parente842bddef36db850a9d63397b535552a03f5c786
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