From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Apr 2018 19:43:18 +0000 (-0700)
Subject: Merge tag 'pstore-v4.17-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~1248
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=190f2ace0efdf632f0451a9543f00f50148837bf;p=platform%2Fkernel%2Flinux-rpi.git

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
---

190f2ace0efdf632f0451a9543f00f50148837bf