Merge tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Dec 2019 19:26:40 +0000 (11:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Dec 2019 19:26:40 +0000 (11:26 -0800)
commit8328dd2f394e48a010383af176bf55ba4be79da0
treed2d7a88a051b99e9a78af2ba9a0ee217cb6ae580
parent1daa56bcfd8b329447e0c1b1e91c3925d08489b7
parent8d82cee2f8aa8b9bc806907ecd9e1494c6e8526b
Merge tag 'pstore-v5.5-rc1' of git://git./linux/kernel/git/kees/linux

Pull pstore bug fix from Kees Cook:

 - add missing "static" (Ben Dooks)

* tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: Make pstore_choose_compression() static