Merge tag 'pstore-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2021 17:08:10 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2021 17:08:10 +0000 (10:08 -0700)
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


Trivial merge