From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 19 Sep 2018 06:29:42 +0000 (+0200)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.19~166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ca719a338d5ebb713e0ae56c208a689f1efe20f;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Crypto stuff from Herbert:
  "This push fixes a potential boot hang in ccp and an incorrect
   CPU capability check in aegis/morus on x86."

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/aegis,morus - Do not require OSXSAVE for SSE2
  crypto: ccp - add timeout support in the SEV command
---

4ca719a338d5ebb713e0ae56c208a689f1efe20f