From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 4 Jan 2021 01:05:34 +0000 (-0500)
Subject: Merge remote-tracking branch 'sparc/master' into work.sparc32
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=73686e787b495a85551e2e99c459adde6836eb31;p=linux.git

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.
---

73686e787b495a85551e2e99c459adde6836eb31