From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Feb 2021 18:27:13 +0000 (-0800)
Subject: Merge tag 'pstore-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: v5.12-rc1~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f02361639a481771130db5e67933c4f414377fce;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'pstore-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull pstore fix from Kees Cook:
 "Fix a CONFIG typo (Jiri Bohac)"

* tag 'pstore-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: Fix typo in compression option name
---

f02361639a481771130db5e67933c4f414377fce