From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jan 2020 00:39:51 +0000 (-0800)
Subject: Merge tag 'pstore-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: v5.15~4817
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=278b14eb920322255bf5b831e2bcfc1bf5999036;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'pstore-v5.5-rc5' of git://git./linux/kernel/git/kees/linux

Pull pstore bug fixes from Kees Cook:

 - always reset circular buffer state when writing new dump (Aleksandr
   Yashkin)

 - fix rare error-path memory leak (Kees Cook)

* tag 'pstore-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore/ram: Write new dumps to start of recycled zones
  pstore/ram: Fix error-path memory leak in persistent_ram_new() callers
---

278b14eb920322255bf5b831e2bcfc1bf5999036