From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Oct 2020 23:01:42 +0000 (+1100)
Subject: Merge remote-tracking branch 'pstore/for-next/pstore' into master
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f633119b37aee06c88896c955d4eac093bbf364e;p=users%2Fhch%2Fblock.git

Merge remote-tracking branch 'pstore/for-next/pstore' into master

# Conflicts:
#	.mailmap
---

f633119b37aee06c88896c955d4eac093bbf364e