Merge tag 'pstore-v4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Sep 2018 04:52:41 +0000 (18:52 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Sep 2018 04:52:41 +0000 (18:52 -1000)
commit145ea6f10d42dac0a1e8a6dfb83b273c0acabf5b
treecac7179f0f523f2f20d9e9cbe1d100d19b6d7bc5
parent4624d6ea1b7fe83f1e36caf4537600414ca833f6
parent831b624df1b420c8f9281ed1307a8db23afb72df
Merge tag 'pstore-v4.19-rc4' of git://git./linux/kernel/git/kees/linux

Pull pstore fix from Kees Cook:
 "This fixes a 6 year old pstore bug that everyone just got lucky in
  avoiding, likely due only using page-aligned persistent ram regions:

   - Handle page-vs-byte offset handling between iomap and vmap (Bin Yang)"

* tag 'pstore-v4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: Fix incorrect persistent ram buffer mapping