Merge tag 'pstore-v4.17-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Apr 2018 19:43:18 +0000 (12:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Apr 2018 19:43:18 +0000 (12:43 -0700)
commit190f2ace0efdf632f0451a9543f00f50148837bf
tree5db6e04e4d8b8802d397cc334f7d5e798e01ada0
parentfd40ffc72e2f74c7db61e400903e7d50a88bc0b0
parente698aaf37f9fac419ac6c1867137cce83c90c80b
Merge tag 'pstore-v4.17-rc1-fix' of git://git./linux/kernel/git/kees/linux

Pull pstore fix from Kees Cook:
 "Fix another compression Kconfig combination missed in testing (Tobias
  Regnery)"

* tag 'pstore-v4.17-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: fix crypto dependencies without compression