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)
commitfadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5
tree2394d6f51dd41f0917acdd0f19339750862219cd
parent74a9e7dbbc4a45ee78560f36903f3c3b1f553928
parentc10e8031d5b34cde06b039ca2e8af87a33d5ba11
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
drivers/firmware/efi/efi-pstore.c