Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 May 2017 02:31:07 +0000 (19:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 May 2017 02:31:07 +0000 (19:31 -0700)
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

1  2 
drivers/firmware/efi/efi-pstore.c

Simple merge