From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 May 2017 02:31:07 +0000 (-0700)
Subject: Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: v5.15~11241
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'pstore-v4.12-rc3' of git://git./linux/kernel/git/kees/linux

Pull pstore fix from Kees Cook:
 "Marta noticed another misbehavior in EFI pstore, which this fixes.

  Hopefully this is the last of the v4.12 fixes for pstore!"

* tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  efi-pstore: Fix write/erase id tracking
---

fadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5