From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Apr 2021 17:08:10 +0000 (-0700)
Subject: Merge tag 'pstore-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: ceph-for-5.13-rc8~349
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=288321a9c65192878446a00acaa9f6c3ca9bb1f5;p=ceph-client.git

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

Pull pstore update from Kees Cook:

 - Add mem_type property to expand support for >2 memory types (Mukesh Ojha)

* tag 'pstore-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: Add mem_type property DT parsing support
---

288321a9c65192878446a00acaa9f6c3ca9bb1f5