]> 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)
commitd7b6a6ddcbf082eb86b8242a77fe6edf19720c7c
tree2b26a24240f11442f326da096f2e824a68252674
parentf781aa423d978beb9c1f7c78f8b449e1e80c3195
parent561d4c1cbd38686371d18826f71e1e37371ed532
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